Changeset 3419 in MondoRescue

Timestamp:

Aug 21, 2015, 1:42:54 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Generate now the boot conf files into PrepareDataDiskImages to use the result in PrepareBootDiskImage This is mandatory for UEFI mode as we seem to need the files generated on the boot media as well

File:

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

branches/3.2/mindi/mindi

@@ -1553 +1553 @@
     LogFile "INFO: Unmounting $USBPART just in case"
     umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
-    if [ $BOOT_TYPE = "BIOS" ]; then
+    if [ "$BOOT_TYPE" = "BIOS" ]; then
         # If your key has no MBR it may cause an issue
         # Use dd if=mbr.bin of=$USBDEVICE or ms-sys -s $USBDEVICE
@@ -1865 +1865 @@
     LogFile "INFO: Creating vfat filesystem on $imagefile"
     mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
-    if [ $BOOT_TYPE = "BIOS" ]; then
+    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
@@ -1876 +1876 @@
     mount -t vfat -o loop $imagefile $mountpoint || LogAll "ERROR: Cannot mount (PBDI)"
 
-    # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
-    if [ $BOOT_TYPE != "BIOS" ]; then
-        if [ $BOOT_TYPE = "UNKNOWN" ]; then
-            LogAll "ERROR: UNKNOWN BOOT_TYPE. Please report upstream"
-            MindiExit -1
-        fi
-        # EFI or UEFI
-        # BCO names are hard-coded for now
-        if [ $BOOT_TYPE = "UEFI" ]; then
-            # UEFI
-            lilodir=$mountpoint/EFI
-            mkdir -p $lilodir
-            liloconf="$lilodir/grub.conf"
-            lilobin="grub.efi"
-            
-            MakeBootConfFile grub > $liloconf
-        else
-            # EFI
-            lilodir=$mountpoint
-            mkdir -p $lilodir
-            liloconf="$mountpoint/elilo.conf"
-            lilobin="elilo.efi"
-
-            MakeBootConfFile elilo > $liloconf
-        fi
-
-        # Copy it so that CD-ROM menu entry is satisfied
-        mountefi=0
-        df -T | grep /boot/efi | grep -qE 'vfat'
-        if [ $? -ne 0 ]; then
-            mount /boot/efi
-            if [ $? -ne 0 ]; then
-                echo "You have to mount your (U)EFI partition when using mindi"
-                MindiExit -1
-            fi
-            mountefi=1
-        fi
-        el=`find /boot/efi -iname $lilobin`
-        cp $el $lilodir
-        if [ $mountefi -eq 1 ]; then
-            umount /boot/efi 2>&1 > /dev/null
-        fi
-    else
-        MakeBootConfFile isolinux > $mountpoint/syslinux.cfg
-    fi
+    # copy boot stuff into it now generated in PrepareDataDisk
+    (cd $mountpoint ; tar xfz $MINDI_CACHE/all.tar.gz boot)
+
     LogFile "INFO: Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..."
     cp -f $MINDI_TMP/initrd.img $mountpoint/initrd.img 2>> $LOGFILE
-    if [ $BOOT_TYPE = "UEFI" ]; then
-            # for grub 0.97 the conf file is not read with the grub.efi file :-(
-            cp $liloconf $MINDI_TMP
-    fi
     if [ "$?" -ne "0" ] ; then
         LogAll "ERROR: Failed to copy $MINDI_TMP/initrd.img to $mountpoint"
@@ -2073 +2027 @@
     fi
 
-    if [ $BOOT_TYPE = "UEFI" ]; then
-            # for grub 0.97 the conf file is not read with the grub.efi file :-( 
-            # Not very nice, but needed
-            if [ -f $MINDI_TMP/grub.conf ]; then
-                mkdir -p $bigdir/boot/grub
-                cp $MINDI_TMP/grub.conf $bigdir/boot/grub
-            fi
-    fi
-
     old_pwd=`pwd`
     cd "$bigdir"
@@ -2132 +2077 @@
             cp -pRdf $MINDI_TMP/$q $bigdir/tmp 2>> $LOGFILE
         done
+    fi
+
+    # copy (e)lilo/syslinux/grub/whatever stuff into it as well
+    # to get it on the media (in addition to the boot part
+    # and also to support UEFI boot mechanism
+    bootdir=$bigdir/boot
+    mkdir -p $bootdir
+    if [ "$BOOT_TYPE" != "BIOS" ]; then
+        if [ "$BOOT_TYPE" = "UNKNOWN" ]; then
+            LogAll "ERROR: UNKNOWN BOOT_TYPE. Please report upstream"
+            MindiExit -1
+        fi
+        # EFI or UEFI
+        # BCO names are hard-coded for now
+        if [ "$BOOT_TYPE" = "UEFI" ]; then
+            # UEFI
+            lilodir=$bootdir/EFI
+            mkdir -p $lilodir
+            liloconf="$lilodir/grub.conf"
+            lilobin="grub.efi"
+            
+            MakeBootConfFile grub > $liloconf
+        else
+            # EFI
+            lilodir=$bootdir
+            mkdir -p $lilodir
+            liloconf="$lilodir/elilo.conf"
+            lilobin="elilo.efi"
+
+            MakeBootConfFile elilo > $liloconf
+        fi
+
+        # Copy it so that CD-ROM menu entry is satisfied
+        mountefi=0
+        df -T | grep /boot/efi | grep -qE 'vfat'
+        if [ $? -ne 0 ]; then
+            mount /boot/efi
+            if [ $? -ne 0 ]; then
+                echo "You have to mount your (U)EFI partition when using mindi"
+                MindiExit -1
+            fi
+            mountefi=1
+        fi
+        el=`find /boot/efi -iname $lilobin`
+        cp $el $lilodir
+        if [ $mountefi -eq 1 ]; then
+            umount /boot/efi 2>&1 > /dev/null
+        fi
+    else
+        MakeBootConfFile isolinux > $bootdir/syslinux.cfg
+    fi
+
+    if [ "$BOOT_TYPE" = "UEFI"] && [ -f "$lilodir/grub.conf" ]; then
+        # for grub 0.97 the conf file is not read with the grub.efi file :-( 
+        # Not very nice, but needed it seems
+        LogFile "Copying grub.conf file as we use legacy grub on UEFI"
+        mkdir -p $bootdir/boot/grub
+        cp $lilodir/grub.conf $bootdir/boot/grub
     fi