Changeset 140 in MondoRescue

Timestamp:

Nov 25, 2005, 11:50:08 PM (18 years ago)

Author:

bcornec

Message:

merge -r136:139 $SVN_M/branches/2.05

Location:

trunk

Files:

• mindi/mindi (modified) (2 diffs)
• mondo/mondo/restore-scripts/mondo/grub-MR (modified) (2 diffs)

trunk/mindi/mindi

@@ -1437 +1437 @@
         for qq in "" `find /dev/ida/c*d* ! -name '*p*'` ; do
         partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
-                echo "------- $FDISK -l log ------------" >> $LOGFILE
+                echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
                 cat $FDISKLOG >> $LOGFILE
                 echo "------- $FDISK log end ------------" >> $LOGFILE
@@ -2450 +2450 @@
 # patch from Bill <bill@iwizard.biz> - 2003/08/25
     res=`$FDISK -s $device`
-    echo "------- $FDISK -l log ------------" >> $LOGFILE
+    echo "------- $FDISK -l $device log ------------" >> $LOGFILE
     cat $FDISKLOG >> $LOGFILE
     echo "------- $FDISK log end ------------" >> $LOGFILE

trunk/mondo/mondo/restore-scripts/mondo/grub-MR

@@ -5 +5 @@
 #
 #
+#
+# 2005/11/25
+# - try_grub_hack : do not return success when grub wrote 'Error '
 #
 # 2004/06/28
@@ -118 +121 @@
     quit \n" > /tmp/feed.txt
     cat /tmp/feed.txt
+    log_file=/tmp/grub.output
     if [ "$MNT_RESTORING" ] ; then
-        chroot /mnt/RESTORING grub --batch < /tmp/feed.txt 
+        chroot /mnt/RESTORING grub --batch < /tmp/feed.txt > $log_file
     else
-        grub --batch < /tmp/feed.txt
+        grub --batch < /tmp/feed.txt > $log_file
     fi
-    return $?
+    cat $log_file
+    if grep "Error [0-9]*: " $log_file >/dev/null; then
+            return 1
+    else
+            return 0
+    fi
 }