Changeset 1755 in MondoRescue for branches/2.2.5

Timestamp:

Oct 31, 2007, 1:11:44 AM (16 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

Files:

• mindi/mindi (modified) (5 diffs)
• mondo/src/restore-scripts/mondo/hack-fstab (modified) (2 diffs)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (2 diffs)

branches/2.2.5/mindi/mindi

@@ -961 +961 @@
     local res currline partition all_partitions ap_orig remaining i j
 
-    grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||^LABEL\=\/|^UUID=/ && !/fdd|cdr|zip|floppy/ {print $1}'
+    grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||^LABEL=\/|^UUID=/ && !/fdd|cdr|zip|floppy/ {print $1}'
     [ -e "/etc/raidtab" ] && $AWK '/^ *device/ {print $2}' /etc/raidtab
     return
@@ -1251 +1251 @@
     done
     [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
-    printf "        %-15s %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL UUID | tee -a $LOGFILE
+    printf "        %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
     useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1"
     for c_p in $all_partitions ; do
@@ -1503 +1503 @@
             fi
         fi
+        if [ "$redhat_label" ]; then
+            label="$redhat_label"
+        else if [ "$uuid" ]; then
+            label="$uuid"
+        fi
         partition_format="`echo "$partition_format" | cut -d',' -f1`"; # in case user has ext3,ext2 or something dumb like that
         [ "$partition_format" = "auto" ] && partition_format="`mount | grep -w $current_partition | $AWK '{print$5;}'`"; # in case user uses 'auto' (dumb!)
-        unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid`
+        unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label"`
         if [ "$current_partition" = "" ] ; then
             echo "Unknown partition (outstring = $unofficial_outstring)" >> $LOGFILE
@@ -1512 +1517 @@
                 partition_mountpt=raid
                 partition_format=raid
-                printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid | tee -a $LOGFILE
-                printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" $uuid >> $mountlist
+                printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label" | tee -a $LOGFILE
+                printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$label" >> $mountlist
             else
                 echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE
@@ -1528 +1533 @@
                 partition_format="vfat"
             fi
-            printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid | tee -a $LOGFILE
-            printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" $uuid >> $mountlist
+            printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label" | tee -a $LOGFILE
+            printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$label" >> $mountlist
         fi
     done

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"