Changeset 1314 in MondoRescue

Timestamp:

Apr 16, 2007, 3:16:24 PM (18 years ago)

Author:

Bruno Cornec

Message:

label-partitions-as-necessary should now work correctly for LABEL and UUID (grep -w removed)

File:

• branches/2.2.2/mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)

branches/2.2.2/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -7 +7 @@
 
 read_partition_line() {
-    local tmp label mountpt command format
+    local label mountpt command format
 
-    if [ "`echo "$1" | grep -E 'LABEL='`" != "" ] ; then
+    label=`echo "$1" | awk '{print $1}' | cut -d'=' -f2`
+    format=`echo "$1" | awk '{print $3}'`
+
+    if [ "`echo "$1" | grep -E 'LABEL='`" != "" ] ; then
         opttun="-L"
-    elif [ "`echo "$1" | grep -E 'UUID='`" != "" ] ; then
+        mountpt=`awk '{print $1,$5}' $mountlist | grep " $label$" | awk '{print $1}'`
+    elif [ "`echo "$1" | grep -E 'UUID='`" != "" ] ; then
         opttun="-U"
+        mountpt=`awk '{print $1,$6}' $mountlist | grep " $label$" | awk '{print $1}'`
     else
         # Nothing to do
         return
-    fi
+    fi
 
-    tmp=`echo "$1" | tr -s ' ' '\t' | cut -f1`
-    label=`echo "$tmp" | cut -d'=' -f2`
-    format=`echo "$1" | tr -s ' ' '\t' | cut -f3`
-    mountpt=`grep -w " $label" $mountlist | cut -d' ' -f1`
     if [ ! "$mountpt" ] ; then
-        LogIt "Not labeling anything as $label because $mountpt is not a mountpoint"
+        LogIt "Not labeling anything as ($label) because ($mountpt) is not a mountpoint"
     elif [ ! "$label" ] ; then
-        LogIt "Not labeling $mountpt as anything because $label is not a label"
+        LogIt "Not labeling ($mountpt) as anything because ($label) is not a label"
     else
         if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then