Changeset 3330 in MondoRescue

Timestamp:

Dec 23, 2014, 7:49:06 AM (9 years ago)

Author:

Bruno Cornec

Message:

• mindi now generates UUIDs in mountlist.txt if no LABEL nor UUID exist
• Fix label-partitions-as-necessary to put back the original UUIDs to the partitions even if no LABEL or UUID line was used in fstab
• Improve btrfs support

Location:

branches/3.2

Files:

• mindi/mindi (modified) (1 diff)
• mindi/parted2fdisk.pl (modified) (1 diff)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (2 diffs)

branches/3.2/mindi/mindi

@@ -1366 +1366 @@
             label="$uuid"
         fi
+
+        # On RHEL 7 they use UUID concretely, even when not mentioned in fstab
+        # in order to mount the root part e.g. in grub.
+        # One way to solve this is to add the UUID now, if there wasn't one so it's
+        # restored correctly
+        if [ _"$label" = _"" ]; then
+            label=`blkid $current_partition | perl -p -e 's/.* UUID="([A-z0-9-]+)" .*/$1/'`
+        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!)

branches/3.2/mindi/parted2fdisk.pl

@@ -152 +152 @@
         "ext4" => "83",
         "xfs" => "83",
+        "btrfs" => "83",
         "reiserfs" => "83",
         "linux-swap" => "82",

branches/3.2/mondo/src/mondorestore/mondo-prep.c

@@ -1837 +1837 @@
              || strcmp(format, "xfs") == 0
              || strcmp(format, "jfs") == 0
-                 || strcmp(format, "btrfs") == 0) {
+             || strcmp(format, "btrfs") == 0) {
     mr_asprintf(partcode, "83");
 } else if (strcmp(format, "minix") == 0) {

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

@@ -7 +7 @@
 
 read_partition_line() {
-    local label mountpt command format
+    local label mountpt command format device d m
 
-    label=`echo "$1" | awk '{print $1}' | cut -d'=' -f2`
+    device=`echo "$1" | awk '{print $1}'`
+    d=`echo "$device" | cut -c1`
     format=`echo "$1" | awk '{print $3}'`
+    label=`echo "$device" | cut -s -d'=' -f2`
+    if [ "$d" = "/" ] && [ "$label" = "" ]; then
+        m=`echo "$1" | awk '{print $2}'`
+        # We force UUID even if nothing in fstab as some new distro like RHEL7 rely on it
+        [ "$format" = "reiserfs" ] && opttun="-u" || opttun="-U"
+        label=`awk '{print $2,$5}' $mountlist | grep -E "^$m " | awk '{print $2}'`
+    else
+        if [ "`echo "$1" | grep -E 'LABEL='`" != "" ] ; then
+            [ "$format" = "reiserfs" ] && opttun="-l" || opttun="-L"
+        elif [ "`echo "$1" | grep -E 'UUID='`" != "" ] ; then
+            [ "$format" = "reiserfs" ] && opttun="-u" || opttun="-U"
+        else
+            LogIt "Nothing to do on $1"
+            return
+        fi
+    fi
     mountpt=`awk '{print $1,$5}' $mountlist | grep " $label$" | awk '{print $1}'`
-
-    if [ "`echo "$1" | grep -E 'LABEL='`" != "" ] ; then
-        [ "$format" = "reiserfs" ] && opttun="-l" || opttun="-L"
-    elif [ "`echo "$1" | grep -E 'UUID='`" != "" ] ; then
-        [ "$format" = "reiserfs" ] && opttun="-u" || opttun="-U"
-    else
-        LogIt "Nothing to do on $1"
-        return
-    fi
 
     if [ ! "$mountpt" ] ; then
         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/uuid"
     else
         if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] || [ "$format" = "ext4" ]; then
@@ -37 +45 @@
         elif [ "$format" = "reiserfs" ]; then
             command="reiserfstune $opttun $label $mountpt"
+            LogIt "Running $command"
+            $command
+        elif [ "$format" = "btrfs" ]; then
+            # Also see https://btrfs.wiki.kernel.org/index.php/Project_ideas#Filesystem_UUID_change_-_off-line
+            command="btrfs filesystem label $mountpt $label"
             LogIt "Running $command"
             $command