Changeset 2669 in MondoRescue

Timestamp:

Jul 2, 2010, 11:49:10 AM (14 years ago)

Author:

Bruno Cornec

Message:

• The way grub.unsupported was called for opensuse 11.2 was wrong. It should be done bfore calling grub-install which also exists. And tested for existence. Now this should fix #412.

File:

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

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

@@ -103 +103 @@
 fi
 
+# For some OpenSuSE
+res=1
+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 2>&1 | tee -a $LOGFILE
+        res=$?
+        echo "grub-install.unsupported 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 2>&1 | tee -a $LOGFILE
+        res=$?
+        echo "grub-install.unsupported returned $res" >> $LOGFILE
+    fi
+fi
+[ "$res" -eq "0" ] && exit 0
+
 echo "Now I'll use grub-install" >> $LOGFILE
 if [ "$MNT_RESTORING" ] ; then
@@ -112 +131 @@
 fi
 echo "grub-install returned $res" >> $LOGFILE
-[ "$res" -eq "0" ] && exit 0
-
-# For some OpenSuSE
-echo "Now I'll use grub-install.unsupported" >> $LOGFILE
-if [ "$MNT_RESTORING" ] ; then
-    chroot $MNT_RESTORING grub-install.unsupported $1 2>&1 | tee -a $LOGFILE
-    res=$?
-else
-    grub-install.unsupported $1 2>&1 | tee -a $LOGFILE
-    res=$?
-fi
-echo "grub-install.unsupported returned $res" >> $LOGFILE
 [ "$res" -eq "0" ] && exit 0