Changeset 3493


Ignore:
Timestamp:
Jan 5, 2016, 1:25:29 AM (23 months ago)
Author:
bruno
Message:
  • Fix mindi to use a subdir called isolinux when using that bootloader with all related files in it and rename syslinux.cfg in to isolinux.cfg so that bootable mindi images now work again
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3491 r3493  
    14991499    cp $kernelpath $MINDI_TMP/iso/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/vmlinuz). Did you run out of disk space?"
    15001500    cp $MINDI_TMP/initrd.img $MINDI_TMP/iso/initrd.img 2>> $LOGFILE || Die "Cannot copy initrd.img ($MINDI_TMP/initrd.img) to $MINDI_TMP/iso/initrd.img. Did you run out of disk space?"
    1501     if [ "$ARCH" != "ia64" ] ; then
    1502         cp $ISOLINUX $MINDI_TMP/iso/isolinux.bin 2>> $LOGFILE || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso - did you run out of disk space?"
    1503     fi
    15041501
    15051502    # copy boot stuff now generated in PrepareDataDiskImage
     
    15111508        tbc="boot"
    15121509    fi
     1510    if [ "$ARCH" != "ia64" ] ; then
     1511        cp $ISOLINUX $MINDI_TMP/iso/$tbc/isolinux.bin 2>> $LOGFILE || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso - did you run out of disk space?"
     1512    fi
    15131513
    15141514    if [ _"$MONDO_SHARE" != _"" ]; then
     
    15281528    cd "$MINDI_TMP/iso"
    15291529    if [ "$ARCH" != "ia64" ] ; then
     1530        cfgf=`find $MINDI_TMP/iso -name 'syslinux.cfg' | head -1`
     1531        cfgf2=`echo $cfgf | sed 's/syslinux.cfg/isolinux.cfg/'`
     1532        mv $cfgf $cfgf2
     1533        # For isolinux boot, name the directory correctly as well as the conf file
     1534        if [ -e "$MINDI_TMP/iso/boot" ]; then
     1535            mv $MINDI_TMP/iso/boot $MINDI_TMP/iso/isolinux
     1536            tbc="isolinux"
     1537        fi
    15301538        if [ _"$MONDO_SHARE" != _"" ]; then
    1531             cp -rf $MINDI_TMP/iso/{initrd.img,vmlinuz,isolinux.bin,message.txt,boot*.txt,pxe.txt,$tbc} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
    1532             cfgf=`find $MINDI_TMP/iso -name 'isolinux.cfg' | head -1`
    1533             if [ -e "$cfgf" ]; then
    1534                 cp $cfgf $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy $cfgf to $MONDO_ROOT. Did you run out of disk space?"
    1535             fi
     1539            cp -rf $MINDI_TMP/iso/{initrd.img,vmlinuz,message.txt,boot*.txt,pxe.txt,$tbc} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
    15361540            if [ $KERNEL_IS_XEN = "yes" ]; then
    15371541                cp -f $MINDI_TMP/iso/xen.gz $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy Xen kernel to $MONDO_ROOT. Did you run out of disk space?"
     
    15391543            cp -f $MONDO_SHARE/autorun $MINDI_TMP/iso 2>> $LOGFILE
    15401544        fi
    1541         CMD="$ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
     1545        CMD="$ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b $tbc/isolinux.bin -c $tbc/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
    15421546    else
    15431547        CMD="$ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.img -c images/boot.cat -no-emul-boot"
     
    25782582        fi
    25792583    done
     2584    LogAll "Processing all dependencies of required files..."
    25802585    for f in `cat $MINDI_TMP/minimal.lis` `sort -u $MINDI_TMP/minimal2.lis`; do
    25812586        mr-read-all-link $f >> $MINDI_TMP/minimal.lis
     
    27072712
    27082713    # Management of perl scripts delivered needed at restore time
    2709     LogIt "INFO: Analyzing perl modules dependencies"
     2714    LogAll "Analyzing perl modules dependencies..."
    27102715    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` /usr/[s]*bin/mr-* 2> $templog > $MINDI_TMP/perl.lis || LogIt "ERROR: Problem in mindi-get-perl-modules" $templog
    27112716    LogFile "DBG4: Perl Modules found:"
     
    27452750
    27462751    [ -e "$needed_modules_path" ] || LogIt "WARNING: path $needed_modules_path does not exist.\n         If you're not using a modular kernel then mindi won't probably work."
     2752    LogAll "Analyzing kernel modules dependencies..."
    27472753    needed_modules=`mr-kernel-get-modules $mkgmopt $list_of_groovy_mods`
    27482754
Note: See TracChangeset for help on using the changeset viewer.