Changeset 3737 in MondoRescue

Timestamp:

Nov 18, 2019, 1:48:39 AM (4 years ago)

Author:

Bruno Cornec

Message:

prepare dir struct and prepare also to umount btrfs subvolumes

File:

• branches/3.3/mindi/mindi (modified) (5 diffs)

branches/3.3/mindi/mindi

@@ -1452 +1452 @@
     # 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
+    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:"
@@ -1463 +1463 @@
     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'
@@ -1471 +1474 @@
             device=$dev
         fi
-        subvol=`echo $opt | cut -d@ -f2 | 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="$btrfs$subvol"
-        echo "btrfs subvolume create $btrfs$subvol" >> $MINDI_TMP/create-btrfs-subvol
-        echo "mount -t btrfs -o subvol=$subvol $device $mountpoint" >> $MINDI_TMP/mount-btrfs-subvol
+        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`
+        while [ $parent != "/" ]; do
+            grep -qE "$sep$parent$" $MINDI_TMP/btrfssubvol.txt
+            if [ $? -ne 0 ];
+                echo "mkdir -p /mnt/RESTORING/$sep$parent" >> $MINDI_TMP/create-btrfs-subvol
+            fi
+            parent=`dirname $parent`
+        done
+        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
+    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 "-----------------------------------------"
@@ -1487 +1500 @@
     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 "-----------------------------------------"
 }
@@ -2394 +2411 @@
     mkdir -p $bigdir/tmp
     cp -f $MINDI_TMP/mountlist.txt $bigdir/tmp/mountlist.txt 2>> $LOGFILE || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
-    cp -f $MINDI_TMP/create-btrfs-subvol $MINDI_TMP/mount-btrfs-subvol $bigdir/tmp/ 2>> $LOGFILE || Die "Cannot copy subvol scripts from $MINDI_TMP to data disk"
+    cp -f $MINDI_TMP/create-btrfs-subvol $MINDI_TMP/mount-btrfs-subvol $MINDI_TMP/umount-btrfs-subvol $bigdir/tmp/ 2>> $LOGFILE || Die "Cannot copy subvol scripts from $MINDI_TMP to data disk"
     if [ _"$MONDO_SHARE" != _"" ]; then
         cp -f $bigdir/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE