Changeset 2931 in MondoRescue for branches/3.0/mondo/src/common/libmondo-devices.c

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, ...)

File:

• branches/3.0/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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);