Changeset 2931 in MondoRescue for branches/3.0/mondo/src/common/libmondo-archive.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-archive.c (modified) (2 diffs)

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