Changeset 729 in MondoRescue for trunk/mondo/mondo/restore-scripts

Timestamp:

Jul 30, 2006, 4:06:39 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r686:728 $SVN_M/branches/stable

Location:

trunk/mondo/mondo/restore-scripts/mondo

Files:

• grub-install.patched (modified) (1 diff)
• label-partitions-as-necessary (modified) (1 diff)

trunk/mondo/mondo/restore-scripts/mondo/grub-install.patched

@@ -257 +257 @@
     # For now, this uses the program `df' to get the device name, but is
     # this really portable?
-    tmp_fname=`df -P $1/ | sed -n 's%.*\(/dev/[^    ]*\).*%\1%p'`
+    tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^   ]*\).*%\1%p'`
 
     if test -z "$tmp_fname"; then

trunk/mondo/mondo/restore-scripts/mondo/label-partitions-as-necessary

@@ -59 +59 @@
 while [ "$line" != "" ] && [ "$noof_blank_lines" -le "5" ] ; do
     if [ "$line" = "" ] ; then
-    noof_blank_lines=$(($noof_blank_lines+1))
+        noof_blank_lines=$(($noof_blank_lines+1))
     else
-    noof_blank_lines=0
-    read_partition_line "$line"
+        noof_blank_lines=0
+        read_partition_line "$line"
     fi
     read line