Changeset 3479 in MondoRescue for branches

Timestamp:

Oct 16, 2015, 12:14:52 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Adds " around file tests with -e in mindi
• Move ldlinux detection earlier in order to integrate it in EFI/BOOT for UEFI mode
• in UEFI mode force GPT label on boot file (requires parted)

File:

• branches/3.2/mindi/mindi (modified) (12 diffs)

branches/3.2/mindi/mindi

@@ -1505 +1505 @@
     # copy boot stuff now generated in PrepareDataDiskImage
     if [ "$BOOT_TYPE" = "UEFI" ]; then
-        FindLdlinuxe64Binary
-        if [ -e $LDLINUXE64 ]; then
-            cp $LDLINUXE64 $MINDI_TMP/iso/ 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to mindi tmp ($MINDI_TMP/iso/). Did you run out of disk space?"
-        fi
         (cd $MINDI_TMP/iso ; tar xfz $MINDI_CACHE/all.tar.gz ./EFI)
         tbc="EFI"
     else
-        # Useful for syslinux 5.x
-        FindLdlinux32Binary
-        if [ -e $LDLINUXC32 ]; then
-            cp $LDLINUXC32 $MINDI_TMP/iso/ 2>> $LOGFILE || Die "Cannot copy $LDLINUXC32 to mindi tmp ($MINDI_TMP/iso/). Did you run out of disk space?"
-        fi
         (cd $MINDI_TMP/iso ; tar xfz $MINDI_CACHE/all.tar.gz ./boot)
         tbc="boot"
@@ -1526 +1517 @@
             cp $MBOOTC32 $MONDO_ROOT/ 2>> $LOGFILE || Die "Cannot copy $MBOOTC32 to mondo tmp ($MONDO_ROOT/). Did you run out of disk space?"
         fi
-        if [ -e $LDLINUXC32 ]; then
+        if [ -e "$LDLINUXC32" ]; then
             cp $LDLINUXC32 $MONDO_ROOT/ 2>> $LOGFILE || Die "Cannot copy $LDLINUXC32 to $MONDO_ROOT/. Did you run out of disk space?"
-        fi
-        if [ -e $LDLINUXE64 ]; then
-            cp $LDLINUXE64 $MONDO_ROOT/ 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $MONDO_ROOT/. Did you run out of disk space?"
         fi
         cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy $kernelpath to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
@@ -1543 +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?"
             cfgf=`find $MINDI_TMP/iso -name 'isolinux.cfg' | head -1`
-            if [ -e $cfgf ]; then
+            if [ -e "$cfgf" ]; then
                 cp $cfgf $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy $cfgf to $MONDO_ROOT. Did you run out of disk space?"
             fi
@@ -1934 +1922 @@
     mkdir -p $mountpoint
     dd if=/dev/zero of=$imagefile bs=1k count=$BOOT_SIZE &> /dev/null || Die "Cannot dd blank file"
-    LogFile "INFO: Creating vfat filesystem on $imagefile"
-    mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
     if [ "$BOOT_TYPE" = "BIOS" ]; then
         # syslinux should be run on a  local file (doen't work through NFS Cf: #297)
         syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
     fi
+    if [ "$BOOT_TYPE" = "UEFI" ]; then
+        # Should be GPT in that case to allow direct boot
+        parted -s $imagefile mklabel gpt
+    fi
+    LogFile "INFO: Creating vfat filesystem on $imagefile"
+    mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
 
     # Only move it now to its final destination and use it now
@@ -2199 +2191 @@
             umount /boot/efi 2>&1 > /dev/null
         fi
-    fi
+
+        FindLdlinuxe64Binary
+        if [ -e "$LDLINUXE64" ]; then
+            LogFile "INFO: Copying $LDLINUXE64 to $efidir"
+            cp $LDLINUXE64 $efidir 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $efidir). Did you run out of disk space?"
+        fi
+    else    
+        # Useful for syslinux 5.x
+        FindLdlinux32Binary
+        if [ -e "$LDLINUXC32" ]; then
+            LogFile "INFO: Copying $LDLINUXC32 to $bootdir"
+            cp $LDLINUXC32 $bootdir 2>> $LOGFILE || Die "Cannot copy $LDLINUXC32 to $bootdir). Did you run out of disk space?"
+        fi
+    fi
+
     MakeBootConfFile $boottype > $bootconf
 
@@ -2564 +2570 @@
     # recent bash says that -d is true for a link to a dir !
     for f in `sort -u $MINDI_TMP/minimal.lis`; do
-        if [ -e $f -a ! -d $f ] || [ -h $f ]; then
+        if [ -e "$f" -a ! -d "$f" ] || [ -h $f ]; then
             # Do not overwrite files already in destination (avoid using option -n of cp not portable)
             if [ ! -e "$mountpoint/$f" ]; then
@@ -2583 +2589 @@
 
     # For older distributions expecting /sbin/init provides it
-    if [ ! -e sbin/init ]; then
+    if [ ! -e "sbin/init" ]; then
         (cd sbin ; ln -sf ../usr/sbin/init .)
     fi
@@ -2647 +2653 @@
             # recent bash says that -d is true for a link to a dir !
             for f in `sort -u $MINDI_TMP/udev.lis`; do
-                if [ -e $f -a ! -d $f ] || [ -h $f ]; then
+                if [ -e "$f" -a ! -d "$f" ] || [ -h "$f" ]; then
                     # Do not overwrite files already in destination (avoid using option -n of cp not portable)
                     if [ ! -e "$mountpoint/$f" ]; then
@@ -2761 +2767 @@
 
     # Ensure that with mindi-busybox 1.21, the links also exists under /bin for older distro which need it for their scripts
-    (cd $mountpoint/usr/bin ; for i in `ls`; do if [ ! -e $mountpoint/bin/$i ]; then (cd $mountpoint/bin ; ln -sf ../usr/bin/$i .); fi; done)
+    (cd $mountpoint/usr/bin ; for i in `ls`; do if [ ! -e "$mountpoint/bin/$i" ]; then (cd $mountpoint/bin ; ln -sf ../usr/bin/$i .); fi; done)
 
     # Copy an additional ProLiant tool for OBDR support
@@ -3005 +3011 @@
 LogFile "-------------"
 mount >> $LOGFILE
-if [ -e /etc/raidtab ]; then
+if [ -e "/etc/raidtab" ]; then
     LogFile "-------------"
     LogFile "/etc/raidtab content:"
@@ -3013 +3019 @@
     LogFile "No file /etc/raidtab"
 fi
-if [ -e /etc/mdadm.conf ]; then
+if [ -e "/etc/mdadm.conf" ]; then
     LogFile "-------------"
     LogFile "/etc/mdadm.conf content:"
@@ -3031 +3037 @@
 cat /proc/swaps >> $LOGFILE
 LogFile "-------------"
-if [ -e /proc/mdstat ]; then
+if [ -e "/proc/mdstat" ]; then
     LogFile "cat /proc/mdstat:"
     LogFile "-------------"