Changeset 1755 in MondoRescue for branches/2.2.5/mondo/src

Timestamp:

Oct 31, 2007, 1:11:44 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix UUID support which was still broken.
Caveat: It can't work for swap partitions as there is no mksap -U option contrary to the -L option for LABEL
So at reboot you won't have swap activated and you'll have to run vol_id -u the_swap_partition to fix your /etc/fstab file

Location:

branches/2.2.5/mondo/src/restore-scripts/mondo

Files:

• hack-fstab (modified) (2 diffs)
• label-partitions-as-necessary (modified) (2 diffs)

branches/2.2.5/mondo/src/restore-scripts/mondo/hack-fstab

@@ -20 +20 @@
     format=`echo "$incoming"     | cut -d' ' -f3`
     size=`echo "$incoming"       | cut -d' ' -f4`
-    label=`echo "$incoming"       | cut -d' ' -f5`
-    uuid=`echo "$incoming"       | cut -d' ' -f6`
+    label=`echo "$incoming"      | cut -d' ' -f5`
     original_fstab_line=`grep " $mountpoint " $old_fstab | grep -v "#" | tr -s ' ' ' '`
     if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
@@ -28 +27 @@
         fi
         if [ "`echo "$original_fstab_line" | grep "UUID="`" != "" ] ; then
-            device="UUID=$uuid"
+            device="UUID=$label"
         fi
     fi

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

@@ -11 +11 @@
     label=`echo "$1" | awk '{print $1}' | cut -d'=' -f2`
     format=`echo "$1" | awk '{print $3}'`
+    mountpt=`awk '{print $1,$5}' $mountlist | grep " $label$" | awk '{print $1}'`
 
     if [ "`echo "$1" | grep -E 'LABEL='`" != "" ] ; then
         opttun="-L"
-        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
@@ -35 +34 @@
             if [ "$opttun" = "-U" ]; then
                 echo "Unable yet to identify swap with UUID"
+                echo "You'll have to modify your /etc/fstab after reboot"
+                echo "Replace the UUID found on the swap line by the one"
+                echo "given by the command vol_id -u $mountpt"
+                echo "And ask Ubuntu guys to deliver a mswap command with"
+                echo "a -U option to update the UUID to what we want !!!"
+
+                sleep 5
             else
                 command="mkswap $opttun $label $mountpt"