Changeset 3147 in MondoRescue for branches/3.1/mondo/src/restore-scripts/mondo/grub-MR

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/restore-scripts/mondo/grub-MR (modified) (3 diffs)

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

@@ -107 +107 @@
 if [ "$MNT_RESTORING" ] ; then
     if [ -x $MNT_RESTORING/usr/sbin/grub-install.unsupported ]; then
-        echo "Now I'll use grub-install.unsupported in chroot" >> $LOGFILE
-        chroot $MNT_RESTORING /usr/sbin/grub-install.unsupported $1 >> $LOGFILE 2>> $LOGFILE
+        echo "Now I'll use OpenSuSE/SLES new grub-install in chroot" >> $LOGFILE
+        chroot $MNT_RESTORING /usr/sbin/grub-install >> $LOGFILE 2>> $LOGFILE
         res=$?
-        echo "grub-install.unsupported in chroot returned $res" >> $LOGFILE
+        echo "grub-install in chroot returned $res" >> $LOGFILE
     fi
 else
     if [ -x /usr/sbin/grub-install.unsupported ]; then
-        echo "Now I'll use grub-install.unsupported locally" >> $LOGFILE
-        /usr/sbin/grub-install.unsupported $1 >> $LOGFILE 2>> $LOGFILE
+        echo "Now I'll use OpenSuSE/SLES new grub-install locally" >> $LOGFILE
+        /usr/sbin/grub-install >> $LOGFILE 2>> $LOGFILE
         res=$?
-        echo "grub-install.unsupported returned $res" >> $LOGFILE
+        echo "grub-install returned $res" >> $LOGFILE
     fi
 fi
@@ -124 +124 @@
 echo "Now I'll use grub-install" >> $LOGFILE
 if [ "$MNT_RESTORING" ] ; then
+    echo "Launching: chroot $MNT_RESTORING grub-install $1" >> $LOGFILE
     chroot $MNT_RESTORING grub-install $1 >> $LOGFILE 2>> $LOGFILE
     res=$?
 else
+    echo "Launching: grub-install $1" >> $LOGFILE
     grub-install $1 >> $LOGFILE 2>> $LOGFILE
     res=$?
 fi
 echo "grub-install returned $res" >> $LOGFILE
+[ "$res" -eq "0" ] && exit 0
+
+
+echo "Now I'll use grub2-install" >> $LOGFILE
+if [ "$MNT_RESTORING" ] ; then
+    chroot $MNT_RESTORING grub2-install $1 >> $LOGFILE 2>> $LOGFILE
+    res=$?
+else
+    grub2-install $1 >> $LOGFILE 2>> $LOGFILE
+    res=$?
+fi
+echo "grub2-install returned $res" >> $LOGFILE
 [ "$res" -eq "0" ] && exit 0
 
@@ -190 +204 @@
 elif [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ]; then
     grep -vE '^#' /boot/grub/grub.cfg > /mnt/RESTORING/tmp/grub.conf
+elif [ -f "/mnt/RESTORING/boot/grub2/grub.cfg" ]; then
+    grep -vE '^#' /boot/grub2/grub.cfg > /mnt/RESTORING/tmp/grub.conf
 else
     echo "Unable to find Grub conf file" | tee -a $LOGFILE