Changeset 3875 in MondoRescue for branches/3.3/mondo/src/common/libmondo-archive.c

Timestamp:

Mar 8, 2024, 3:19:14 AM (2 months ago)

Author:

Bruno Cornec

Message:

find_dvd|cdrom_device merged into a rewritten find_optical_device - adds find_usb_device and find_device - mount_CDROM_here moved to mount_media (ongoing)

File:

• branches/3.3/mondo/src/common/libmondo-archive.c (modified) (4 diffs)

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

@@ -2466 +2466 @@
 
     mr_asprintf(bkp, "%s", cd_dev);
-    if ((cd_dev = find_dvd_device()) != NULL) {
+    if ((cd_dev = find_optical_device()) != NULL) {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
             mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cd_dev);
@@ -2536 +2536 @@
     ok_go_ahead_burn_it = TRUE;
     mr_free(cdrom_dev);
-    if ((cdrom_dev = find_cdrom_device()) != NULL) {
+    if ((cdrom_dev = find_optical_device()) != NULL) {
         /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
         log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
@@ -3096 +3096 @@
         if (g_current_media_number == 1 && !res
             && (bkpinfo->backup_media_type == cdr)) {
-            if ((tmp = find_cdrom_device()) == NULL) {  // make sure find_cdrom_device() finds, records CD-R's loc
+            if ((tmp = find_optical_device())   == NULL) {  // make sure find_optical_device() finds, records CD-R's loc
                 log_msg(3, "*Sigh* Mike, I hate your computer.");
                 // if it can't be found then force pausing
@@ -3208 +3208 @@
         if (bkpinfo->backup_media_type != iso) {
             mr_free(bkpinfo->media_device);
-            bkpinfo->media_device = find_cdrom_device();    // replace 0,0,0 with /dev/cdrom
+            bkpinfo->media_device = find_optical_device();  // replace 0,0,0 with /dev/cdrom
         }
         if (chdir("/")) {