Changeset 3502


Ignore:
Timestamp:
Feb 9, 2016, 2:34:54 PM (22 months ago)
Author:
bruno
Message:
  • Adds support for xorriso for UEFI distributions using it such as Debian 8
Location:
branches/3.2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3499 r3502  
    106106DEPLIST_DIR="$MINDI_CONF/deplist.d"
    107107
    108 ISO_CMD="/usr/bin/mkisofs"
     108# Debian 8 system e.g. use xorriso for UEFI support.
     109# However, they use exactly the same command line parameters as mkisofs, so just
     110# use it if it's available.
     111ISO_CMD="/usr/bin/xorriso"
     112
     113# Mandriva system e.g. use cdrkit, which uses genisoimage.
     114# However, they use exactly the same command line parameters as mkisofs, so just
     115# use it if it's available.
     116if [ ! -x $ISO_CMD ]; then
     117    ISO_CMD=/usr/bin/genisoimage
     118fi
     119
     120# For compatibility with previous versions default to mkisofs
     121if [ ! -x $ISO_CMD ]; then
     122    ISO_CMD=/usr/bin/mkisofs
     123fi
     124
    109125ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
    110126
     
    123139    [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib64/syslinux/mbr.bin
    124140fi
    125 
    126 # Mandriva system e.g. use cdrkit, which uses genisoimage instead of mkisofs.
    127 # However, they use exactly the same command line parameters, so just
    128 # use genisoimage if it's available.
    129 if [ ! -x $ISO_CMD ]; then
    130     ISO_CMD=/usr/bin/genisoimage
    131 fi
    132 
    133141
    134142# Function to log on screen only
     
    14671475    local i old_pwd files
    14681476    if [ -z "$ISO_CMD" ]; then
    1469         LogAll "ERROR: Neither mkisofs nor genisoimage found, unable to make CD image"
     1477        LogAll "ERROR: Neither mkisofs nor genisoimage nor xorriso found, unable to make CD image"
    14701478        return
    14711479    fi
  • branches/3.2/mondo-doc/mondorescue-howto.sgml

    r3471 r3502  
    923923page</ulink> for details.</para>
    924924<para>Mondo requires afio, bzip2, cdrtools/cdrecord/growisofs (may be part of the dvd+rw-tools package), ncurses, newt,
    925         isolinux/syslinux, lzo (optional), lzop (optional), mkisofs/genisoimage, slang,
     925        isolinux/syslinux, lzo (optional), lzop (optional), mkisofs/genisoimage/xorriso, slang,
    926926and a few other packages.</para>
    927927<para>Good Linux distributions provide all these packages. If yours
  • branches/3.2/mondo/src/common/libmondo-archive.c

    r3499 r3502  
    17051705        mr_asprintf(result_sz, "Call to mkisofs to make ISO (%s #%d) ", mds,  g_current_media_number);
    17061706        mr_free(mds);
    1707         if (find_home_of_exe("genisoimage")) {
     1707        if (find_home_of_exe("xorriso")) {
     1708            mr_asprintf(isofs_cmd, "%s", MONDO_XORRISO_CMD);
     1709        else if (find_home_of_exe("genisoimage")) {
    17081710            mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
    17091711        } else {
  • branches/3.2/mondo/src/common/libmondo-tools.c

    r3500 r3502  
    481481            fatal_error("Please install either cdrecord or dvdrecord.");
    482482        }
    483         if (find_home_of_exe("genisoimage")) {
     483        if (find_home_of_exe("xorriso")) {
     484            mr_asprintf(isofs_cmd, "%s", MONDO_XORRISO_CMD);
     485        else if (find_home_of_exe("genisoimage")) {
    484486            mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
    485487        } else {
     
    934936#endif
    935937    retval += whine_if_not_found(MKE2FS_OR_NEWFS);
    936     if (system("which genisoimage > /dev/null 2> /dev/null")) {
    937         retval += whine_if_not_found("mkisofs");
     938    if (system("which xorriso > /dev/null 2> /dev/null")) {
     939        if (system("which genisoimage > /dev/null 2> /dev/null")) {
     940            retval += whine_if_not_found("mkisofs");
     941        }
    938942    }
    939943    if (system("which wodim > /dev/null 2> /dev/null")) {
  • branches/3.2/mondo/src/include/my-stuff.h

    r3498 r3502  
    178178#define MONDO_MKISOFS_CMD "mkisofs"
    179179#define MONDO_GENISOIMAGE_CMD "genisoimage"
     180#define MONDO_XORRISO_CMD "xorriso"
    180181#define MONDO_MKISOFS " -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version "
    181182#define MONDO_MKISOFS_UEFI " -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot "
Note: See TracChangeset for help on using the changeset viewer.