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

Timestamp:

Mar 10, 2024, 12:46:53 AM (2 years 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

Location:

branches/3.3/mondo/src/mondorestore

Files:

• mondo-rstr-compare-EXT.h (modified) (1 diff)
• mondo-rstr-compare.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (2 diffs)
• mondorestore.c (modified) (4 diffs)

branches/3.3/mondo/src/mondorestore/mondo-rstr-compare-EXT.h

@@ -3 +3 @@
 
 extern int compare_to_CD();
-extern int compare_to_cdstream();
 extern int compare_to_tape();
 extern int compare_mode(struct mountlist_itself *mountlist,

branches/3.3/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -555 +555 @@
 
 /**
- * Compare all data on a cdstream-based backup.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->disaster_recovery
- * - @c bkpinfo->media_device
- * - @c bkpinfo->restore_path
- * @return 0 for success, nonzero for failure.
- */
-int compare_to_cdstream()
-{
-    int res;
-
-  /** needs malloc **/
-    char *dir;
-    char *command = NULL;
-
-    assert(bkpinfo != NULL);
-    malloc_string(dir);
-    if (getcwd(dir, MAX_STR_LEN)) {
-        // FIXME
-    }
-    if (chdir(bkpinfo->restore_path)) {
-        // FIXME
-    }
-
-    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
-    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
-
-    if (bkpinfo->disaster_recovery
-        && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-    } else {
-        bkpinfo->media_device = find_optical_device();
-    }
-    res = verify_tape_backups();
-    if (chdir(dir)) {
-        // FIXME
-    }
-    if (length_of_file(MONDO_CACHE"/changed.txt") > 2
-        && length_of_file(MONDO_CACHE"/changed.files") > 2) {
-        log_msg(0,
-                "Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives");
-        log_msg(2, "Calling popup_changelist_from_file()");
-        popup_changelist_from_file(MONDO_CACHE"/changed.files");
-        log_msg(2, "Returned from popup_changelist_from_file()");
-    }
-
-    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    paranoid_free(dir);
-    return (res);
-}
-
-/**************************************************************************
- *END_COMPARE_CD_STREAM                                                   *
- **************************************************************************/
-
-
-
-/**
  * Compare all data in the user's backup.
  * This function will mount filesystems, compare afioballs and biggiefiles,
@@ -682 +622 @@
         || bkpinfo->backup_media_type == udev) {
         retval += compare_to_tape();
-    } else if (bkpinfo->backup_media_type == cdstream) {
-        retval += compare_to_cdstream();
     } else {
         retval += compare_to_CD();

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -940 +940 @@
 
 if (0 == read_cfg_var(cfg_file, "backup-media-type", value)) {
-    if (!strcmp(value, "cdstream")) {
-        bkpinfo->backup_media_type = cdstream;
-    } else if (!strcmp(value, "optical")) {
+    if (!strcmp(value, "optical")) {
         bkpinfo->backup_media_type = optical;
     } else if (!strcmp(value, "usb")) {
@@ -1008 +1006 @@
 
 if (bkpinfo->disaster_recovery) {
-    if (bkpinfo->backup_media_type == cdstream) {
-        mr_asprintf(bkpinfo->media_device, "%s", "/dev/cdrom");
-        bkpinfo->media_size = 650;  /* good guess */
-    } else if (bkpinfo->backup_media_type == usb) {
+    if (bkpinfo->backup_media_type == usb) {
         envtmp1 = getenv("MRUSBDEV");
         if (envtmp1 == NULL) {

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.");
         }
     }