Changeset 3429


Ignore:
Timestamp:
Aug 27, 2015, 10:50:26 AM (3 years ago)
Author:
bruno
Message:

( Only use MBR when dealing with a BIOS type of boot env

Location:
branches/3.2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3428 r3429  
    7777# Force some modules to be included
    7878FORCE_MODS=""
    79 
    80 # Find MBR in case of bootable USB device to build
    81 MBRFILE=/usr/lib/syslinux/mbr.bin
    82 [ ! -r "$MBRFILE" ] && MBRFILE=/usr/lib64/syslinux/mbr.bin
    83 [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/syslinux/mbr.bin
    84 [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib/syslinux/mbr.bin
    85 [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib64/syslinux/mbr.bin
    8679
    8780LOGFILE=/var/log/mindi.log
     
    119112    BOOT_TYPE="UEFI"
    120113    ISO_OPT="$ISO_OPT -eltorito-alt-boot -e images/mindi-bootroot.img -no-emul-boot"
     114else
     115    # Find MBR in case of bootable USB device to build
     116    MBRFILE=/usr/lib/syslinux/mbr.bin
     117    [ ! -r "$MBRFILE" ] && MBRFILE=/usr/lib64/syslinux/mbr.bin
     118    [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/syslinux/mbr.bin
     119    [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib/syslinux/mbr.bin
     120    [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib64/syslinux/mbr.bin
    121121fi
    122122
     
    21502150    fi
    21512151
    2152     #if [ "$BOOT_TYPE" = "UEFI" ] && [ -f "$lilodir/grub.conf" ]; then
    2153         # for grub 0.97 the conf file is not read with the grub.efi file :-(
    2154         # Not very nice, but needed it seems
    2155         #LogFile "Copying grub.conf file as we use legacy grub on UEFI"
    2156         #mkdir -p $bootdir/boot/grub
    2157         #cp $lilodir/grub.conf $bootdir/boot/grub
    2158     #fi
    2159 
    21602152    echo -en "Tarring and zipping the data content..."
    21612153    size_of_all_tools=`du -sk $bigdir | cut -f1`
  • branches/3.2/mondo-doc/mondoarchive.8

    r3371 r3429  
    359359.TP
    360360.BI "\-l " "GRUB|LILO|ELILO|RAW"
    361 Specify the boot loader. By default, your Master Boot Record is examined and
     361Specify the boot loader. By default, your environment is examined and
    362362the boot loader can usually be discovered. If you specify RAW then the MBR will
    363363be backed up and restored byte-for-byte without any analysis. It is likely that
    364364you will also need to specify the boot device with \-f <dev>. ELILO is mandatory
    365 for IA64 machines.
     365for IA64 machines. GRUB is mandatory for now for UEFI systems.
    366366
    367367.TP
  • branches/3.2/mondo/src/common/libmondo-devices.c

    r3422 r3429  
    400400
    401401/**
    402  * Determine whether given NULL-terminated @p str exists in the MBR of @p dev.
     402 * Determine whether given NULL-terminated @p str exists in the begining of @p dev.
    403403 * @param dev The device to look in.
    404404 * @param str The string to look for.
  • branches/3.2/mondo/src/common/mondostructures.h

    r3375 r3429  
    207207    interactive,                    /// Interactive mode
    208208    compare,                    /// Compare mode
    209     mbr,                        /// MBR mode
     209    mbr,                        /// MBR restore only
    210210    isoonly,                    /// ISO mode
    211211    isonuke,                    /// ISO+Nuke mode
  • branches/3.2/mondo/src/restore-scripts/mondo/grub-MR

    r3378 r3429  
    9393
    9494if [ "$#" -ne "2" ] ; then
    95     Die "grub-MR <MBR drive> <mountlist filename>; e.g. grub-MR /dev/hda /tmp/mountlist.txt"
     95    Die "grub-MR <boot drive> <mountlist filename>; e.g. grub-MR /dev/hda /tmp/mountlist.txt"
    9696fi
    9797[ ! -f "$2" ] && Die "mountlist file not found"
Note: See TracChangeset for help on using the changeset viewer.