Changeset 3533


Ignore:
Timestamp:
Mar 9, 2016, 7:35:58 PM (19 months ago)
Author:
bruno
Message:
  • In UEFI case, as in ia64 one we need to boot the media from the mindi-bootroot content, so clean up first before copying it to the mount point. Maybe we can point elsewhere in a next commit.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3532 r3533  
    17641764if  [ "$target" = "ISO" ]; then
    17651765    # ISO
    1766     if [ "$ARCH" != "ia64" ] ; then
     1766    if [ "$ARCH" != "ia64" ] && [ "$BOOT_TYPE" = "BIOS" ]; then
    17671767        CMD="$ISO_CMD $ISO_OPT -b $tbc/isolinux.bin -c $tbc/boot.cat -U -boot-load-size 4 -boot-info-table"
    17681768        MakeISO
     
    17761776if  [ "$target" = "ISO" ]; then
    17771777    cp $part $MINDI_CACHE
    1778     if [ "$ARCH" = "ia64" ] ; then
     1778    if [ "$ARCH" = "ia64" ] || [ "$BOOT_TYPE" = "UEFI" ]; then
    17791779        # Here we need to remount to put the boot image at the right place now it's available
    17801780        mount -t vfat $mount_opt $part $MINDI_TMP/mpt 2>> $LOGFILE
    1781         cp $MINDI_CACHE/$part $MINDI_TMP/mpt/images
     1781        # We don't need the previous content used to make it, free space
     1782        rm -rf $MINDI_TMP/mpt/{EFI,initrd.img,vmlinuz,images/all.tar.gz}
     1783        # We need the boot image now
     1784        cp $MINDI_CACHE/mindi-bootroot.img $MINDI_TMP/mpt/images
    17821785        MakeISO
    17831786        umount $MINDI_TMP/mpt || Die "Unable to unmount $MINDI_TMP/mpt"
     
    27162719            fnllist=`echo $finallist | tr ' ' '\n' | sort -u | tr '\n' ' '`
    27172720            LogFile "INFO: Copying udev related files with cp -a --parents $fnllist -t $mountpoint/"
    2718             cp -a --parents $fnllist $lis3 -t $mountpoint/ 2> $templog  || LogIt "ERROR: Problem in udev.lis analysis" $templog
     2721            cp -a --parents $fnllist $lis3 -t $mountpoint/ 2> $templog  || LogIt "WARNING: Problem in udev.lis analysis" $templog
    27192722            rm -f $MINDI_TMP/udev.lis
    27202723        else
Note: See TracChangeset for help on using the changeset viewer.