Changeset 3882 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondorestore.c

Timestamp:

Mar 10, 2024, 12:46:53 AM (2 months ago)

Author:

Bruno Cornec

Message:

More cleanup

• Remove support for cd stream never really tested/useful/... (-C option removed for mondoarchive)
• Remove dvdrecord specificities as obsolete
• Remove types cdr and dvd to keep a single optical
• Remove cdrw_speed param as obsolete now it's automatically detected
• mondoarchive -c has no parameter anymore
• Remove some useless global variables
• Replaces some remaining /mnt/cdrom values by the define MNT_CDROM

File:

• branches/3.3/mondo/src/mondorestore/mondorestore.c (modified) (4 diffs)

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -673 +673 @@
 /**
  * Restore @p tarball_fname from CD.
- * @param tarball_fname The filename of the tarball to restore (in /mnt/cdrom).
+ * @param tarball_fname The filename of the tarball to restore (in MNT_CDROM).
  * This will be used unmodified.
  * @param current_tarball_number The number (starting from 0) of the fileset
@@ -1800 +1800 @@
         mvaddstr_and_log_it(g_currentY++, 0,
                             "Restoring OS and data from streaming media");
-        if (bkpinfo->backup_media_type == cdstream) {
-            openin_cdstream();
-        } else {
-            assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
-            openin_tape();
-        }
+        assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
+        openin_tape();
         resA = restore_all_tarballs_from_stream(filelist);
         resB = restore_all_biggiefiles_from_stream(filelist);
-        if (bkpinfo->backup_media_type == cdstream) {
-            closein_cdstream();
-        } else {
-            closein_tape();
-        }
+        closein_tape();
     } else {
         mount_media(MNT_CDROM);
@@ -2332 +2324 @@
     } else {
         popup_and_OK("No restoring or comparing will take place today.");
-        if (is_this_device_mounted("/mnt/cdrom")) {
-            run_program_and_log_output("umount -d /mnt/cdrom", FALSE);
+        if (is_this_device_mounted(MNT_CDROM)) {
+            run_program_and_log_output("umount -d "MNT_CDROM, FALSE);
         }
         if (g_ISO_restore_mode) {
@@ -2919 +2911 @@
 
             if (!bkpinfo->please_dont_eject) {
-                (void)eject_device("/dev/cdrom");
-            }
-            mvaddstr_and_log_it(g_currentY++,
-                                0,
-                                "Run complete. Please remove media and reboot.");
+                (void)eject_device(bkpinfo->backup_media_type);
+            }
+            mvaddstr_and_log_it(g_currentY++, 0, "Run complete. Please remove media and reboot.");
         }
     }