Changeset 3744 in MondoRescue for branches/3.3/mindi/mindi

Timestamp:

Nov 18, 2019, 12:32:44 PM (4 years ago)

Author:

Bruno Cornec

Message:

Only handle btrfs subvol when there are some

File:

• branches/3.3/mindi/mindi (modified) (1 diff)

branches/3.3/mindi/mindi

@@ -1447 +1447 @@
     LogAll "-----------------------------------" 
 
-    # Manages btrfs subvol partitions so they can be restored
-    # List looks like this
-    # ID 257 gen 20074 top level 5 path <FS_TREE>/@
-    # ID 260 gen 19927 top level 257 path @/home
-    # ID 261 gen 19927 top level 257 path @/opt
-    touch $MINDI_TMP/create-btrfs-subvol $MINDI_TMP/mount-btrfs-subvol $MINDI_TMP/umount-btrfs-subvol
-    btrfs subvolume list -a / 2>/dev/null > $MINDI_TMP/btrfssubvol.txt
-    LogFile "btrfs subvolumes layout is:"
-    LogFile "---------------------------"
-    cat $MINDI_TMP/btrfssubvol.txt  >> $LOGFILE
-    LogFile "---------------------------"
-    grep -E 'btrfs[     ]+subvol=' /etc/fstab > $MINDI_TMP/btrfs-extract
-    LogFile "btrfs subvolumes referenced in fstab:"
-    LogFile "-------------------------------------"
-    cat $MINDI_TMP/btrfs-extract >> $LOGFILE
-    LogFile "-------------------------------------"
-    # We suppose there is only one FS
-    sep=`btrfs subvolume list -a / | grep FS_TREE | sed 's/.*<FS_TREE>\/\(.*\)/\1/'`
-    echo "btrfs subvolume create /mnt/RESTORING/$sep" >> $MINDI_TMP/create-btrfs-subvol
-    while read dev mp type opt dum dum; do 
-        echo $dev | grep -qE 'UUID|LABEL'
-        if [ $? -eq 0 ]; then
-            label=`echo $dev | cut -d= -f2`
-            device=`grep $label $mountlist | awk '{print $1}'`
-        else
-            device=$dev
-        fi
-        subvol=`echo $opt | awk -F$sep '{ print $2 }' | cut -d, -f1`
-        #top=`grep -E "@$subvol$" $MINDI_TMP/btrfssubvol.txt | awk '{ print $7 }'`
-        #btrfs=`grep -E "^ID $top " $MINDI_TMP/btrfssubvol.txt | awk '{ print $9 }' | sed 's/<FS_TREE>//' | sed 's/@$//'`
-        mountpoint="/mnt/RESTORING/$sep$subvol"
-        # If the intermediate dirs of subvol are not a subvolume, we need to create them as dir
-        parent=`dirname $subvol`
-        grep -qE "$sep$parent$" $MINDI_TMP/btrfssubvol.txt
-        if [ $? -ne 0 ]; then
-            echo "mkdir -p /mnt/RESTORING/$sep$parent" >> $MINDI_TMP/create-btrfs-subvol
-        fi
-        echo "btrfs subvolume create $mountpoint" >> $MINDI_TMP/create-btrfs-subvol
-        echo "mount -t btrfs -o subvol=$sep$subvol $device $mountpoint" >> $MINDI_TMP/mount-btrfs-subvol
-        echo "umount $mountpoint" >> $MINDI_TMP/umount-btrfs-subvol
-    done <  $MINDI_TMP/btrfs-extract
-    rm -f  $MINDI_TMP/btrfs-extract
-    chmod 755 $MINDI_TMP/create-btrfs-subvol $MINDI_TMP/mount-btrfs-subvol $MINDI_TMP/umount-btrfs-subvol
-    LogFile "Your create-btrfs-subvol file content is:"
-    LogFile "-----------------------------------------"
-    cat $MINDI_TMP/create-btrfs-subvol  >> $LOGFILE
-    LogFile "-----------------------------------------"
-    LogFile "Your mount-btrfs-subvol file content is:"
-    LogFile "-----------------------------------------"
-    cat $MINDI_TMP/mount-btrfs-subvol  >> $LOGFILE
-    LogFile "-----------------------------------------"
-    LogFile "Your umount-btrfs-subvol file content is:"
-    LogFile "-----------------------------------------"
-    cat $MINDI_TMP/umount-btrfs-subvol  >> $LOGFILE
-    LogFile "-----------------------------------------"
+    # Manages potential btrfs subvol partitions so they can be restored
+    grep -qE 'btrfs[    ]+subvol=' $MY_FSTAB
+    if [ $? -eq 0 ]; then
+        # List looks like this
+        # ID 257 gen 20074 top level 5 path <FS_TREE>/@
+        # ID 260 gen 19927 top level 257 path @/home
+        # ID 261 gen 19927 top level 257 path @/opt
+        touch $MINDI_TMP/create-btrfs-subvol $MINDI_TMP/mount-btrfs-subvol $MINDI_TMP/umount-btrfs-subvol
+        btrfs subvolume list -a / 2>/dev/null > $MINDI_TMP/btrfssubvol.txt
+        LogFile "btrfs subvolumes layout is:"
+        LogFile "---------------------------"
+        cat $MINDI_TMP/btrfssubvol.txt  >> $LOGFILE
+        LogFile "---------------------------"
+        grep -E 'btrfs[     ]+subvol=' $MY_FSTAB > $MINDI_TMP/btrfs-extract
+        LogFile "btrfs subvolumes referenced in fstab:"
+        LogFile "-------------------------------------"
+        cat $MINDI_TMP/btrfs-extract >> $LOGFILE
+        LogFile "-------------------------------------"
+        # We suppose there is only one FS
+        sep=`btrfs subvolume list -a / | grep FS_TREE | sed 's/.*<FS_TREE>\/\(.*\)/\1/'`
+        echo "btrfs subvolume create /mnt/RESTORING/$sep" >> $MINDI_TMP/create-btrfs-subvol
+        while read dev mp type opt dum dum; do 
+            echo $dev | grep -qE 'UUID|LABEL'
+            if [ $? -eq 0 ]; then
+                label=`echo $dev | cut -d= -f2`
+                device=`grep $label $mountlist | awk '{print $1}'`
+            else
+                device=$dev
+            fi
+            subvol=`echo $opt | awk -F$sep '{ print $2 }' | cut -d, -f1`
+            #top=`grep -E "@$subvol$" $MINDI_TMP/btrfssubvol.txt | awk '{ print $7 }'`
+            #btrfs=`grep -E "^ID $top " $MINDI_TMP/btrfssubvol.txt | awk '{ print $9 }' | sed 's/<FS_TREE>//' | sed 's/@$//'`
+            mountpoint="/mnt/RESTORING/$sep$subvol"
+            # If the intermediate dirs of subvol are not a subvolume, we need to create them as dir
+            parent=`dirname $subvol`
+            grep -qE "$sep$parent$" $MINDI_TMP/btrfssubvol.txt
+            if [ $? -ne 0 ]; then
+                echo "mkdir -p /mnt/RESTORING/$sep$parent" >> $MINDI_TMP/create-btrfs-subvol
+            fi
+            echo "btrfs subvolume create $mountpoint" >> $MINDI_TMP/create-btrfs-subvol
+            echo "mount -t btrfs -o subvol=$sep$subvol $device $mountpoint" >> $MINDI_TMP/mount-btrfs-subvol
+            echo "umount $mountpoint" >> $MINDI_TMP/umount-btrfs-subvol
+        done <  $MINDI_TMP/btrfs-extract
+        rm -f  $MINDI_TMP/btrfs-extract
+        chmod 755 $MINDI_TMP/create-btrfs-subvol $MINDI_TMP/mount-btrfs-subvol $MINDI_TMP/umount-btrfs-subvol
+        LogFile "Your create-btrfs-subvol file content is:"
+        LogFile "-----------------------------------------"
+        cat $MINDI_TMP/create-btrfs-subvol  >> $LOGFILE
+        LogFile "-----------------------------------------"
+        LogFile "Your mount-btrfs-subvol file content is:"
+        LogFile "-----------------------------------------"
+        cat $MINDI_TMP/mount-btrfs-subvol  >> $LOGFILE
+        LogFile "-----------------------------------------"
+        LogFile "Your umount-btrfs-subvol file content is:"
+        LogFile "-----------------------------------------"
+        cat $MINDI_TMP/umount-btrfs-subvol  >> $LOGFILE
+        LogFile "-----------------------------------------"
+    fi
 }