Changeset 3741 in MondoRescue

Timestamp:

Nov 18, 2019, 2:48:58 AM (4 years ago)

Author:

Bruno Cornec

Message:

Call the btrfs subvol functions after mounting the base FS

Location:

branches/3.3/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (1 diff)
• mondorestore.c (modified) (1 diff)

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

@@ -795 +795 @@
 log_to_screen(tmp);
 mr_free(tmp);
-
-/*  BR#852: we need to create BTRFS subvols now */
-if ((! res) && (strcmp(format, "btrfs") == 0)) {
-    /*  Creating potential btrfs subvolumes */
-    if (does_file_exist("/tmp/create-btrfs-subvol")) {
-        run_program_and_log_output("/tmp/create-btrfs-subvol",3);
-    }
-    /*  Mounting potential btrfs subvolumes */
-    if (does_file_exist("/tmp/mount-btrfs-subvol")) {
-        run_program_and_log_output("/tmp/mount-btrfs-subvol",3);
-    }
-}
 
 /*  BR#836: we need to do it a second time if -m wasn't working in that version for XFS */

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -1974 +1974 @@
         goto end_of_func;
     }
+    /*  BR#852: we need to create BTRFS subvols now */
+    /*  Creating potential btrfs subvolumes */
+    if (does_file_exist("/tmp/create-btrfs-subvol")) {
+        run_program_and_log_output("/tmp/create-btrfs-subvol",3);
+    }
+    /*  Mounting potential btrfs subvolumes */
+    if (does_file_exist("/tmp/mount-btrfs-subvol")) {
+        run_program_and_log_output("/tmp/mount-btrfs-subvol",3);
+    }
+
     /* restore */
     if ((restore_all = ask_me_yes_or_no("Do you want me to restore all of your data?"))) {