Changeset 3743 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

Really place the btrfs subvol handler at the right place i.e. shared

Location:

branches/3.3/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (1 diff)
• mondorestore.c (modified) (1 diff)

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -576 +576 @@
     (void)mount_device("/proc","/proc","proc",TRUE);
     (void)mount_device("/sys","/sys","sysfs",TRUE);
+    /*  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);
+    }
     run_program_and_log_output("df -m -P -T", 3);
     paranoid_free(mountlist);

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

@@ -1973 +1973 @@
         retval++;
         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);
     }