Changeset 3726 in MondoRescue

Timestamp:

Nov 11, 2019, 11:59:48 PM (5 years ago)

Author:

Bruno Cornec

Message:

Fix #852 by using btrfstune

File:

• branches/3.3/mondo/src/restore-scripts/mondo/mr-label-partitions-as-necessary (modified) (2 diffs)

branches/3.3/mondo/src/restore-scripts/mondo/mr-label-partitions-as-necessary

@@ -7 +7 @@
 
 read_partition_line() {
-    local label mountpt command format device d m
+    local label mountpt command format device d m dev
 
-    device=`echo "$1" | awk '{print $1}'`
-    d=`echo "$device" | cut -c1`
+    dev=`echo "$1" | awk '{print $1}'`
+    d=`echo "$dev" | cut -c1`
     format=`echo "$1" | awk '{print $3}'`
-    label=`echo "$device" | cut -s -d'=' -f2`
+    label=`echo "$dev" | cut -s -d'=' -f2`
     if [ "$d" = "/" ] && [ "$label" = "" ]; then
         m=`echo "$1" | awk '{print $2}'`
@@ -48 +48 @@
             $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"
+            echo "$1" | awk '{print $4}' | grep -q 'subvol='
+            if [ $? -eq 0 ]; then
+                LogIt "Nothing to do on btrfs subvol"
+                return
+            fi
+            if [ "$opttun" = "-U" ]; then
+                # Also see https://btrfs.wiki.kernel.org/index.php/Project_ideas#Filesystem_UUID_change_-_off-line
+                device=`awk '{print $1,$5}' $mountlist | grep -E " $label" | awk '{print $1}'`
+                command="btrfstune $opttun $label $device"
+            else
+                command="btrfs filesystem label $mountpt $label"
+            fi
             LogIt "Running $command"
             $command