Changeset 2866 in MondoRescue

Timestamp:

Aug 23, 2011, 4:43:09 AM (14 years ago)

Author:

Bruno Cornec

Message:

r4226@localhost: bruno | 2011-08-23 03:11:12 +0200

• Try to again improve the mount/umount stuff in mondo

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-devices.c

@@ -1508 +1508 @@
         return;
     }
+    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
+        || bkpinfo->backup_media_type == netfs) {
+        g_ISO_restore_mode = TRUE;
+    }
     malloc_string(tmp);
     malloc_string(request);
     sprintf(tmp, "mkdir -p " MNT_CDROM);
     run_program_and_log_output(tmp, 5);
-    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
-        || bkpinfo->backup_media_type == netfs) {
-        g_ISO_restore_mode = TRUE;
-        if (!is_this_device_mounted(MNT_CDROM)) {
-            log_msg(3, "Mounting media");
-            g_current_media_number = cd_number_i_want;
-            mount_media();
-        }
-    }
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
         log_msg(3, "Currently, we hold %d but we want %d", res,
                 cd_number_i_want);
+
+        /* Now we need to umount the current media to have the next mounted after */
+        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        log_msg(3, "Mounting next media %d",cd_number_i_want);
+        g_current_media_number = cd_number_i_want;
+        mount_media();
+
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         sprintf(tmp, "Insisting on %s #%d", mds, cd_number_i_want);