Changeset 3425 in MondoRescue

Timestamp:

Aug 27, 2015, 12:56:13 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Fixes needed by RHEL7 after a first run on a DL380/UEFI mode.

File:

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

branches/3.2/mindi/mindi

@@ -118 +118 @@
 if [ -d "/sys/firmware/efi" ]; then
     BOOT_TYPE="UEFI"
+    ISO_OPT="$ISO_OPT -eltorito-alt-boot -e images/mindi-bootroot.img -no-emul-boot"
 fi
 
@@ -655 +656 @@
             LogIt "ERROR: Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP"
             LogIt "       I bet you've got a spare copy of Mondo or Mindi floating around on your system."
-                LogIt "       If Mindi was called by Mondo then send me a bug report."
+            LogIt "       If Mindi was called by Mondo then send a bug report."
             LogIt "       It not, type 'ps ax' to see which Mondo-related process is still running then kill it. :-)"
             LogIt "       Finally, run Mindi again."
@@ -1494 +1495 @@
 
     # copy boot stuff now generated in PrepareDataDiskImage
-    if [ $BIOS_TYPE = "UEFI" ]; then
+    if [ "$BOOT_TYPE" = "UEFI" ]; then
         (cd $MINDI_TMP/iso ; tar xfz $MINDI_CACHE/all.tar.gz ./EFI)
         tbc="EFI"
@@ -1655 +1656 @@
         k=$MINDI_TMP/usb
         if [ -e "$j" ] ; then
-            LogIt "INFO: Copying $j to $k"
+            LogFile "INFO: Copying $j to $k"
             cp -f $j $k 2>> $LOGFILE || Die "Failed to copy $j to $k"
             cp -f $j $MINDI_TMP 2>> $LOGFILE || Die "Failed to copy $j to $MINDI_TMP"
@@ -3052 +3053 @@
 fi
 if [ -d /boot/efi ]; then
-    gcf=`find /boot/efi -name grub.conf`
+    gcf=`find /boot/efi -name 'grub.c*'`
     if [ _"$gcf" = _"" ]; then
-        LogFile "Found a /boot/efi directory without a grub.conf file in it"
+        LogFile "Found a /boot/efi directory without a grub config file in it"
     else
         LogFile "-------------"
@@ -3361 +3362 @@
 
 if [ -f $MINDI_TMP/$MRCFG ]; then
-    LogIt "INFO: Your $MRCFG file is:"
-    LogIt "--------------------------"
-    cat $MINDI_TMP/$MRCFG | tee -a $LOGFILE
-    LogIt "--------------------------"
+    LogFile "INFO: Your $MRCFG file is:"
+    LogFile "--------------------------"
+    cat $MINDI_TMP/$MRCFG >> $LOGFILE
+    LogFile "--------------------------"
 else
     if [ _"$MONDO_SHARE" != _"" ] ; then