Changeset 2931 in MondoRescue

Timestamp:

Jan 24, 2012, 12:48:04 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Really never inject or eject when the -e option is passed or device is inappropriate (USB, Net, ...)

Location:

branches/3.0/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-devices.c (modified) (2 diffs)
• libmondo-fork.c (modified) (1 diff)

branches/3.0/mondo/src/common/libmondo-archive.c

@@ -2830 +2830 @@
 
     if (!ok_go_ahead_burn_it) {
-        eject_device(cdrom_dev);
+        if (!bkpinfo->please_dont_eject) {
+            eject_device(cdrom_dev);
+        }
         mds = media_descriptor_string(g_backup_media_type);
         mr_asprintf(&tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", 
@@ -3531 +3533 @@
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
 //    if (bkpinfo->backup_media_type != iso && !bkpinfo->please_dont_eject_when_restoring)
-//{
-        eject_device(bkpinfo->media_device);
-//}
+        if (!bkpinfo->please_dont_eject) {
+            eject_device(bkpinfo->media_device);
+        }
     }
     mr_asprintf(&tmp, "%s/changed.files", MONDO_CACHE);

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

@@ -95 +95 @@
 {
 //  log_it("rctada: Retracting all CD trays", __LINE__);
-    if (strlen(g_cdrom_drive_is_here) > 0) {
-        inject_device(g_cdrom_drive_is_here);
-    }
-    if (strlen(g_dvd_drive_is_here) > 0) {
-        inject_device(g_dvd_drive_is_here);
-    }
-    if (strlen(g_cdrw_drive_is_here) > 0) {
-        inject_device(g_cdrw_drive_is_here);
+    if (!bkpinfo->please_dont_eject) {
+        if (strlen(g_cdrom_drive_is_here) > 0) {
+            inject_device(g_cdrom_drive_is_here);
+        }
+        if (strlen(g_dvd_drive_is_here) > 0) {
+            inject_device(g_dvd_drive_is_here);
+        }
+        if (strlen(g_cdrw_drive_is_here) > 0) {
+            inject_device(g_cdrw_drive_is_here);
+        }
     }
 //  log_it("rctada: killing autorun");
@@ -3018 +3020 @@
     }
 //  assert_string_is_neither_NULL_nor_zerolength(dev);
-    log_msg(10, "Injecting %s", dev);
-    inject_device(dev);
+    if (!bkpinfo->please_dont_eject) {
+        log_msg(10, "Injecting %s", dev);
+        inject_device(dev);
+    }
     if (!does_file_exist(dev)) {
         log_msg(10, "%s doesn't exist. Returning FALSE.", dev);

branches/3.0/mondo/src/common/libmondo-fork.c

@@ -79 +79 @@
  * - @c bkpinfo->manual_cd_tray
  * - @c bkpinfo->backup_media_type
- * - @c bkpinfo->please_dont_eject_when_restoring
  * @param basic_call The call to mkisofs. May contain tokens that will be resolved to actual data. The tokens are:
  * - @c _ISO_ will become the ISO file (@p isofile)