Changeset 2619 in MondoRescue for branches

Timestamp:

Apr 8, 2010, 4:16:04 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fixes for #414: remove comments from grub conf file if used and improve grub conf file generation

File:

• branches/2.2.9/mondo/src/restore-scripts/mondo/grub-MR (modified) (6 diffs)

branches/2.2.9/mondo/src/restore-scripts/mondo/grub-MR

@@ -105 +105 @@
 echo "Now I'll use grub-install" >> $LOGFILE
 if [ "$MNT_RESTORING" ] ; then
-    chroot $MNT_RESTORING grub-install $1 >> $LOGFILE
+    chroot $MNT_RESTORING grub-install $1 2>&1 | tee -a  $LOGFILE
     res=$?
 else
-    grub-install $1 >> $LOGFILE
+    grub-install $1 2>&1 | tee -a $LOGFILE
     res=$?
 fi
@@ -117 +117 @@
 echo "Now I'll use grub-install.unsupported" >> $LOGFILE
 if [ "$MNT_RESTORING" ] ; then
-    chroot $MNT_RESTORING grub-install.unsupported $1 >> $LOGFILE
+    chroot $MNT_RESTORING grub-install.unsupported $1 2>&1 | tee -a $LOGFILE
     res=$?
 else
-    grub-install.unsupported $1 >> $LOGFILE
+    grub-install.unsupported $1 2>&1 | tee -a $LOGFILE
     res=$?
 fi
@@ -128 +128 @@
 echo "Trying a hack" >> $LOGFILE
 FindBootPart $1 $2 2>&1 | tee -a $LOGFILE
-mbrdev=`echo $1 | sed 's/[^0-9]*\([0-9]*\)$/\1/'`
+mbrdev=`echo $1 | sed 's/\([^0-9]*\)[0-9]*$/\1/'`
 if echo $bootpart | grep "/cciss/" > /dev/null ; then
     partno=`basename $bootpart | cut -d'p' -f2`
+    mbrdev=`echo $mbrdev | cut -d'p' -f1`
 elif echo $bootpart | grep "/mapper/mpath" > /dev/null ; then
     partno=`basename $bootpart | cut -d'p' -f3`
+    mbrdev=`echo $mbrdev | cut -d'p' -f1`
 else
     partno=`basename $bootpart | sed 's/[a-z]*//'`
@@ -160 +162 @@
 for driveno in 0 1 2 ; do
     try_grub_hack $driveno $partno "" >> $LOGFILE 2>> $LOGFILE && break
-    try_grub_Hack $driveno $partno "find $BOOTPATHNAME/stage1" >> $LOGFILE 2>> $LOGFILE && break
+    try_grub_hack $driveno $partno "find $BOOTPATHNAME/stage1" >> $LOGFILE 2>> $LOGFILE && break
 done
 res=$?
@@ -170 +172 @@
 echo "Now I'll use grub-install.patched" >> $LOGFILE
 cp -f `which grub-install.patched` /mnt/RESTORING/sbin
-chroot /mnt/RESTORING grub-install.patched $1 >> $LOGFILE
+chroot /mnt/RESTORING grub-install.patched $1 2>&1 | tee -a $LOGFILE
 res=$?
 echo "grub-install.patched returned $res" >> $LOGFILE
@@ -178 +180 @@
 
 if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ]; then
-    GRUBCFGFILE=/boot/grub/menu.lst
+    grep -vE '^#' /boot/grub/menu.lst > /mnt/RESTORING/tmp/grub.conf
 elif [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ]; then
-    GRUBCFGFILE=/boot/grub/grub.cfg
+    grep -vE '^#' /boot/grub/grub.cfg > /mnt/RESTORING/tmp/grub.conf
 else
-    echo "Unable to find Grub conf file"
+    echo "Unable to find Grub conf file" | tee -a $LOGFILE
     exit -1
 fi
-echo "Trying to use the existing $GRUBCFGFILE file in batch mode" >> $LOGFILE
-chroot /mnt/RESTORING grub --batch < /mnt/RESTORING$GRUBCFGFILE
+echo "Trying to use the existing grub conf file in batch mode" >> $LOGFILE
+cat /mnt/RESTORING/tmp/grub.conf >> $LOGFILE
+chroot /mnt/RESTORING grub --batch < /mnt/RESTORING/tmp/grub.conf
 res=$?
-echo "$GRUBCFGFILE approach returned $res" >> $LOGFILE
+echo "grub conf file approach returned $res" >> $LOGFILE
+rm -f /mnt/RESTORING/tmp/grub.conf
 [ "$res" -eq "0" ] && exit 0