Changeset 914 in MondoRescue for trunk/mondo/src/restore-scripts

Timestamp:

Nov 2, 2006, 2:00:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r902:913 $SVN_M/branches/stable

Location:

trunk/mondo/src/restore-scripts/mondo

Files:

• compare-me (modified) (1 diff)
• make-me-bootable (modified) (1 diff)

trunk/mondo/src/restore-scripts/mondo/compare-me

@@ -261 +261 @@
 fi
 
-grep -v -x "Files [^:]*:-" /tmp/compare-me.log \
+grep -v -E '^Files [^:]*:-$' /tmp/compare-me.log \
 | sort -u > /tmp/suspect.files
 

trunk/mondo/src/restore-scripts/mondo/make-me-bootable

@@ -42 +42 @@
     partno=$root_part
 else
-    driveline=`grep -w /boot $1`
-    [ ! "$driveline" ] && driveline=`grep -w / $1`
+    driveline=`grep -E '[   ]/boot[     ]' $1`
+    [ ! "$driveline" ] && driveline=`grep -E '[     ]/[     ]' $1`
     partno=`echo "$driveline" | cut -d' ' -f1 | awk -F "[a-z]" '{print $NF;}'`
 #    echo "driveline=$driveline --> partno=$partno"