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

Timestamp:

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

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-archive.c (modified) (11 diffs)
• libmondo-cli.c (modified) (4 diffs)
• libmondo-devices.c (modified) (5 diffs)
• libmondo-stream-EXT.h (modified) (2 diffs)
• libmondo-stream.c (modified) (7 diffs)
• libmondo-string.c (modified) (1 diff)
• libmondo-tools.c (modified) (5 diffs)
• mondostructures.h (modified) (1 diff)
• newt-specific.c (modified) (2 diffs)

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

@@ -34 +34 @@
 #include <unistd.h>
 
-#define DVDRWFORMAT 1
-
 /**
  * Maximum number of filesets allowed in this function.
@@ -496 +494 @@
     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);
-        } else if (!system("which dvdrecord > /dev/null 2> /dev/null")) {
             mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cd_dev);
         } else {
@@ -759 +755 @@
                 ("Serious error(s) occurred already. I shan't try to write to media.");
         } else {
-            res =
-                eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, message_to_screen);
+            res = eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, message_to_screen);
             if (res) {
                 log_to_screen("%s...failed to write", message_to_screen);
@@ -773 +768 @@
             }
             retval += res;
-#ifdef DVDRWFORMAT
-            mr_asprintf(tmp, "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'", MONDO_LOGFILE);
-            if (g_backup_media_type == dvd
-                && (res || !run_program_and_log_output(tmp, 1))) {
-                log_to_screen
-                    ("Failed to write to disk. I shall blank it and then try again.");
-                sleep(5);
-                /* reset error counter before trying to blank DVD */
-                retval -= res;
-                sync();
-                pause_for_N_seconds(5, "Letting DVD drive settle");
-
-// dvd+rw-format --- OPTION 2
-                if (!bkpinfo->please_dont_eject) {
-                    log_to_screen("Ejecting media to clear drive status.");
-                    eject_device(bkpinfo->media_device);
-                    inject_device(bkpinfo->media_device);
+            if (bkpinfo->wipe_media_first) {
+                mr_asprintf(tmp, "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'", MONDO_LOGFILE);
+                if (g_backup_media_type == optical && (res || !run_program_and_log_output(tmp, 1))) {
+                    log_to_screen("Failed to write to disk. I shall blank it and then try again.");
+                    sleep(5);
+                    /* reset error counter before trying to blank media */
+                    retval -= res;
+                    sync();
+                    pause_for_N_seconds(5, "Letting DVD drive settle");
+
+                    if (!bkpinfo->please_dont_eject) {
+                        log_to_screen("Ejecting media to clear drive status.");
+                        eject_device(bkpinfo->media_device);
+                        inject_device(bkpinfo->media_device);
+                    }
+                    pause_for_N_seconds(5, "Letting optical drive settle");
+
+                    // dvd+rw-format --- OPTION 2
+                    if (bkpinfo->media_device) {
+                        mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
+                    } else {
+                        mr_asprintf(sz_blank_disk, "dvd+rw-format");
+                    }
+                    log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
+                    res = run_external_binary_with_percentage_indicator_NEW("Blanking optical disk", sz_blank_disk);
+                    if (res) {
+                        log_to_screen("Warning - format failed. (Was it a DVD-R?) Sleeping for 5 seconds to take a breath...");
+                        pause_for_N_seconds(5, "Letting optical drive settle... and trying again.");
+                        res = run_external_binary_with_percentage_indicator_NEW("Blanking optical disk", sz_blank_disk);
+                        if (res) {
+                            log_to_screen("Format failed a second time.");
+                        }
+                    } else {
+                        log_to_screen
+                            ("Format succeeded. Sleeping for 5 seconds to take a breath...");
+                    }
+                    mr_free(sz_blank_disk);
+                    pause_for_N_seconds(5, "Letting optical drive settle");
+                    if (!bkpinfo->please_dont_eject) {
+                        log_to_screen("Ejecting media to clear drive status.");
+                        eject_device(bkpinfo->media_device);
+                        inject_device(bkpinfo->media_device);
+                    }
+                    pause_for_N_seconds(5, "Letting optical drive settle");
+                    res = eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, message_to_screen);
+                    retval += res;
+                    if (!bkpinfo->please_dont_eject) {
+                        log_to_screen("Ejecting media.");
+                        eject_device(bkpinfo->media_device);
+                    }
+                    if (res) {
+                        log_to_screen("Dagnabbit. It still failed.");
+                    } else {
+                        log_to_screen
+                            ("OK, this time I successfully backed up to DVD.");
+                    }
                 }
-                pause_for_N_seconds(5, "Letting DVD drive settle");
-                if (bkpinfo->media_device) {
-                    mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
-                } else {
-                    mr_asprintf(sz_blank_disk, "dvd+rw-format");
-                }
-                log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
-                res = run_external_binary_with_percentage_indicator_NEW("Blanking DVD disk", sz_blank_disk);
-                if (res) {
-                    log_to_screen("Warning - format failed. (Was it a DVD-R?) Sleeping for 5 seconds to take a breath...");
-                    pause_for_N_seconds(5, "Letting DVD drive settle... and trying again.");
-                    res = run_external_binary_with_percentage_indicator_NEW("Blanking DVD disk", sz_blank_disk);
-                    if (res) {
-                        log_to_screen("Format failed a second time.");
-                    }
-                } else {
-                    log_to_screen
-                        ("Format succeeded. Sleeping for 5 seconds to take a breath...");
-                }
-                mr_free(sz_blank_disk);
-                pause_for_N_seconds(5, "Letting DVD drive settle");
-                if (!bkpinfo->please_dont_eject) {
-                    log_to_screen("Ejecting media to clear drive status.");
-                    eject_device(bkpinfo->media_device);
-                    inject_device(bkpinfo->media_device);
-                }
-                pause_for_N_seconds(5, "Letting DVD drive settle");
-                res = eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, message_to_screen);
-                retval += res;
-                if (!bkpinfo->please_dont_eject) {
-                    log_to_screen("Ejecting media.");
-                    eject_device(bkpinfo->media_device);
-                }
-                if (res) {
-                    log_to_screen("Dagnabbit. It still failed.");
-                } else {
-                    log_to_screen
-                        ("OK, this time I successfully backed up to DVD.");
-                }
-            }
-            mr_free(tmp);
-#endif
-            if (g_backup_media_type == dvd && !bkpinfo->please_dont_eject) {
+                mr_free(tmp);
+            }
+            if (g_backup_media_type == optical && !bkpinfo->please_dont_eject) {
                 eject_device(bkpinfo->media_device);
             }
@@ -1221 +1215 @@
     log_msg(1, "Closing tape/CD/USB ... ");
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        /* write tape/cdstream */
+        /* write tape */
         closeout_tape();
     } else {
@@ -2494 +2488 @@
  * @param bkpinfo The backup information structure. Fields used:
  * - @c backup_media_type
- * - @c cdrw_speed
  * - @c prefix
  * - @c isodir
@@ -2531 +2524 @@
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to archive your data");
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        if (bkpinfo->backup_media_type == cdstream) {
-            openout_cdstream(bkpinfo->media_device, bkpinfo->cdrw_speed);
-        } else {
-            openout_tape(); /* sets g_tape_stream */
-        }
+        openout_tape(); /* sets g_tape_stream */
         if (!g_tape_stream) {
             fatal_error("Cannot open backup (streaming) device");
@@ -2545 +2534 @@
             log_msg(1, "Backing up to USB's");
         } else {
-            log_msg(1, "Backing up to CD's");
+            log_msg(1, "Backing up to optical drive's");
         }
     }
@@ -2850 +2839 @@
     case optical:
         mr_asprintf(value, "optical");
-        break;
-    case cdstream:
-        mr_asprintf(value, "cdstream");
         break;
     case tape:
@@ -3077 +3063 @@
     assert(bkpinfo != NULL);
 
-    if (bkpinfo->backup_media_type == dvd) {
-#ifdef DVDRWFORMAT
-        if ((tmp = find_home_of_exe("dvd+rw-format")) == NULL) {
+    if (bkpinfo->backup_media_type == optical) {
+        if (bkpinfo->wipe_media_first) {
+            if ((tmp = find_home_of_exe("dvd+rw-format")) == NULL) {
+                mr_free(tmp);
+                fatal_error("Cannot find dvd+rw-format. Please install it or fix your PATH.");
+            }
             mr_free(tmp);
-            fatal_error("Cannot find dvd+rw-format. Please install it or fix your PATH.");
-        }
-        mr_free(tmp);
-#endif
+        }
         if ((tmp = find_home_of_exe("growisofs")) == NULL) {
             mr_free(tmp);
@@ -3158 +3144 @@
             // FIXME
         }
-        mvaddstr_and_log_it(g_currentY, 0,
-                            "Verifying archives against live filesystem");
-        if (bkpinfo->backup_media_type == cdstream) {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");
-        }
+        mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against live filesystem");
         verify_tape_backups();
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");

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

@@ -310 +310 @@
     }
 
-    if (g_kernel_version >= 2.6 && !flag_set['d'] && flag_set['c'] && (! bkpinfo->restore_data)) {
-        fatal_error("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
-    }
-
-
     if (flag_set['J']) {
         if (flag_set['I']) {
@@ -325 +320 @@
 
     if (flag_set['c'] && (! bkpinfo->restore_data)) {
-        if (system("which cdrecord > /dev/null 2> /dev/null") && system("which dvdrecord > /dev/null 2> /dev/null")) {
-            fatal_error("Please install dvdrecord/cdrecord and try again.");
-        } else {
-            log_msg(3, "flag_val['c'] = %s", flag_val['c']);
-            if (flag_set['c']) {
-                bkpinfo->cdrw_speed = atoi(flag_val['c']);
-            }
+        if (system("which cdrecord > /dev/null 2> /dev/null")) {
+            fatal_error("Please install cdrecord and try again.");
         }
         if (!flag_set['d']) {
@@ -516 +506 @@
     if (flag_set['c']) {
         bkpinfo->backup_media_type = optical;
-    }
-    if (flag_set['C']) {
-        bkpinfo->backup_media_type = cdstream;
     }
     if (flag_set['i']) {
@@ -707 +694 @@
     }
 
-    if (!flag_set['d'] && (flag_set['c'] || flag_set['C'])) {
-            tmp1 = mr_popup_and_get_string("Device", "Please specify the device", bkpinfo->media_device);
-            if (tmp1 == NULL) {
-                retval++;
-                log_to_screen("User opted to cancel.");
-            } else {
-                mr_free(bkpinfo->media_device);
-                bkpinfo->media_device = tmp1;
-            }
+    if (!flag_set['d'] && flag_set['c']) {
+        tmp1 = mr_popup_and_get_string("Device", "Please specify the device", bkpinfo->media_device);
+        if (tmp1 == NULL) {
+            retval++;
+            log_to_screen("User opted to cancel.");
         } else {
-    }
-
-    if ((!flag_set['d'] && !flag_set['n'] && !flag_set['C']) && (! bkpinfo->restore_data)) {
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = tmp1;
+        }
+    }
+
+    if ((!flag_set['d'] && !flag_set['n']) && (! bkpinfo->restore_data)) {
         retval++;
         log_to_screen("Please specify the backup device/directory.\n");

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

@@ -715 +715 @@
         mr_asprintf(output, "%s", "optical");
         break;
-    case cdstream:
-        mr_asprintf(output, "%s", "cdstream");
-        break;
     case netfs:
         mr_asprintf(output, "%s", "netfs");
@@ -2058 +2055 @@
         }
 
-        bkpinfo->compression_level = (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
+        bkpinfo->compression_level = 5;
         if ((bkpinfo->compression_level = which_compression_level()) == -1) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
         }
-        bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
-        bkpinfo->use_lzo = (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
+        bkpinfo->use_lzo = FALSE;
     }
     mvaddstr_and_log_it(2, 0, " ");
@@ -2096 +2092 @@
 
         if (archiving_to_media) {
-            if (bkpinfo->backup_media_type == dvd) {
-                strcpy(tmp1, "1");
+            if (bkpinfo->backup_media_type == optical) {
                 mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
-                log_msg(1, "Setting to DVD defaults");
+                log_msg(1, "Setting to DVD defaults ~4.4GB");
             } else {
-                strcpy(tmp1, "4");
-                mr_asprintf(sz_size, "%d", 650);
-                log_msg(1, "Setting to CD defaults");
-            }
-
-            mr_asprintf(comment, "What speed is your %s writer?", mds);
-            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (!popup_and_get_string("Speed", comment, tmp1, 4)) {
-                    log_to_screen("User has chosen not to backup the machine");
-                    mr_free(comment);
-                    finish(1);
-                }
-            }
-            mr_free(comment);
-            bkpinfo->cdrw_speed = atoi(tmp1);   // if DVD then this shouldn't ever be used anyway :)
-
-            strcpy(tmp1, sz_size);
+                mr_asprintf(sz_size, "%d", 0);  // No value for USB
+            }
+
             mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
-            if (!popup_and_get_string("Size", comment, tmp1, 5)) {
+            tmp1 = popup_and_get_string("Size", comment, sz_size, 5)) {
+            if (!tmp1) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
-            }
-            mr_asprintf(sz_size, "%s", tmp1);
-            bkpinfo->media_size = atoi(sz_size);
-
+            } else {
+                bkpinfo->media_size = atoi(tmp1);
+            }
+            mr_free(tmp1);
             if (bkpinfo->media_size <= 0) {
                 log_to_screen("User has chosen not to backup the machine");
@@ -2131 +2113 @@
             }
         }
-        /* No break because we continue even for usb */
-    case cdstream:
 
         // If media_device not found ask
@@ -2166 +2146 @@
         }
         mr_free(mds);
-
-        if (bkpinfo->backup_media_type == cdstream) {
-            bkpinfo->media_size = 650;
-        }
         break;
+
     case udev:
         if (!ask_me_yes_or_no

branches/3.3/mondo/src/common/libmondo-stream-EXT.h

@@ -10 +10 @@
 extern int maintain_collection_of_recent_archives(char *td,
                                                   char *latest_fname);
-extern int openin_cdstream();
 extern int openin_tape();
-extern int openout_cdstream(char *cddev, int speed);
 extern int openout_tape();
 extern int read_file_from_stream_to_file(
@@ -38 +36 @@
 extern int write_header_block_to_stream(off_t length_of_incoming_file, const char *filename, int control_char);
 extern void wrong_marker(int should_be, int it_is);
-extern int closein_cdstream();
 extern int read_EXAT_files_from_tape(
                                      long long *ptmp_size, char *tmp_fname,

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

@@ -53 +53 @@
 /**
  * The file pointer for the opened tape/CD stream.
- * Opened and closed by openin_tape(), openin_cdstream(),
- * openout_tape(), openout_cdstream(), closein_tape(), closein_cdstream(),
- * closeout_tape(), and closeout_cdstream().
+ * Opened and closed by openin_tape(),
+ * openout_tape(), closein_tape(),
+ * closeout_tape().
  */
 FILE *g_tape_stream = NULL;
@@ -165 +165 @@
  * @return 0 for success, nonzero for failure.
  * @note This should be called by restore processes only.
- * @note This function also works for cdstreams for now, but don't count on this behavior.
  * @bug @p bkpinfo parameter is unused.
  */
@@ -217 +216 @@
 
 
-
-/**
- * Close the global output file descriptor which Mondo has used to read
- * from the CD stream.
- * @param bkpinfo The backup information structure. Passed directly to closein_tape().
- * @return 0 for success, nonzero for failure.
- * @note This should be called by restore processes only.
- */
-int closein_cdstream()
-{
-    return (closein_tape());
-}
 
 /**
@@ -343 +330 @@
     log_it("New tape requested.");
     insist_on_this_tape_number(g_current_media_number + 1); // will increment g_current_media, too
-    if (bkpinfo->backup_media_type == cdstream) {
-        mr_asprintf(command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE, MONDO_LOGFILE);
-        log_it("Opening OUT to next CD with the command");
-        log_it(command);
-        log_it("Let's see what happens, shall we?");
-        g_tape_stream = popen(command, "w");
-        mr_free(command);
-
-        if (!g_tape_stream) {
-            log_to_screen("Failed to openout to cdstream (fifo)");
-            return (1);
-        }
-    } else {
-        log_it("Opening OUT to next tape");
-        if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'w', bkpinfo->internal_tape_block_size))) {
-            log_OS_error(g_tape_fifo);
-            log_to_screen("Cannot openin stream device");
-            return (1);
-        }
+    log_it("Opening OUT to next tape");
+    if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'w', bkpinfo->internal_tape_block_size))) {
+        log_OS_error(g_tape_fifo);
+        log_to_screen("Cannot openin stream device");
+        return (1);
     }
     g_tape_posK = 0;
@@ -1241 +1214 @@
  * - @c bkpinfo->tmpdir
  * @return 0 for success, nonzero for failure.
- * @note This will also work with a cdstream for now, but don't count on this behavior.
  */
 int openin_tape()
@@ -1372 +1344 @@
 
 /**
- * Open the CD stream for input.
- * @param bkpinfo The backup information structure. Passed to openin_tape().
- * @return 0 for success, nonzero for failure.
- * @note Equivalent to openin_tape() for now, but don't count on this behavior.
- */
-int openin_cdstream()
-{
-    return (openin_tape());
-}
-
-/**
  * Return the non-rewinding device when passed the normal one
  * @param tapedev The tape device to open for writing.
@@ -1481 +1442 @@
 
     return(res);
-}
-
-
-/**
- * Start writing to a CD stream.
- * @param cddev The CD device to openout via cdrecord.
- * @param speed The speed to write at.
- * @return 0 for success, nonzero for failure.
- * @note This should be called only from backup processes.
- */
-int openout_cdstream(char *cddev, int speed)
-{
-    /*@ buffers ***************************************************** */
-    char *command = NULL;
-
-    /*@ end vars *************************************************** */
-
-    if (cddev == NULL) {
-        log_to_screen("Failed to openout NULL cddev");
-        return (1);
-    }
-    /*  add 'dummy' if testing */
-    mr_asprintf(command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
-    /*  initialise the catalog */
-    g_current_media_number = 1;
-    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-        fatal_error("Cannot alloc mem for tape catalog");
-    }
-    g_tapecatalog->entries = 0;
-    /* log stuff */
-    log_it("Opening OUT cdstream with the command");
-    log_it(command);
-    /*  log_it("Let's see what happens, shall we?"); */
-    g_tape_stream = popen(command, "w");
-    mr_free(command);
-
-    if (g_tape_stream) {
-        return (0);
-    } else {
-        log_to_screen("Failed to openout to cdstream (fifo)");
-        return (1);
-    }
 }
 

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

@@ -982 +982 @@
         mr_asprintf(type_of_backup, "tape");
         break;
-    case cdstream:
-        mr_asprintf(type_of_backup, "CDR");
-        break;
     case udev:
         mr_asprintf(type_of_backup, "udev");

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

@@ -344 +344 @@
  * - Used: @c bkpinfo->backup_data
  * - Used: @c bkpinfo->backup_media_type
- * - Used: @c bkpinfo->cdrw_speed
  * - Used: @c bkpinfo->compression_level
  * - Used: @c bkpinfo->include_paths
@@ -434 +433 @@
     }
 
-// DVD
-
-    if (bkpinfo->backup_media_type == dvd) {
+    if (bkpinfo->backup_media_type == optical) {
         if ((cdr_exe = find_home_of_exe("growisofs")) == NULL) {
             fatal_error("Please install growisofs.");
@@ -493 +490 @@
         if ((cdr_exe = find_home_of_exe("cdrecord")) == NULL) {
             if ((cdr_exe = find_home_of_exe("wodim")) == NULL) {
-                if ((cdr_exe = find_home_of_exe("dvdrecord")) == NULL) {
-                    fatal_error("Please install either cdrecord, wodim or dvdrecord.");
-                }
+                fatal_error("Please install either cdrecord or wodim.");
             }
         }
@@ -543 +538 @@
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
-            mr_asprintf(bkpinfo->call_make_iso, "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed, bkpinfo->tmpdir);
+            mr_asprintf(bkpinfo->call_make_iso, "%s %s -v %s fs=4m dev=%s %s/"MONDO_TMPISOS, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->tmpdir);
         } else {
-            mr_asprintf(bkpinfo->call_make_iso, "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -", mondo_mkisofs_sz, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed);
+            mr_asprintf(bkpinfo->call_make_iso, "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s -", mondo_mkisofs_sz, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device);
         }
         mr_free(cdr_exe);
@@ -994 +989 @@
     bkpinfo->differential = 0;
     bkpinfo->please_dont_eject = FALSE;
-    bkpinfo->cdrw_speed = 0;
     bkpinfo->manual_cd_tray = FALSE;
     bkpinfo->nonbootable_backup = FALSE;

branches/3.3/mondo/src/common/mondostructures.h

@@ -611 +611 @@
    */
     bool please_dont_eject;
-
-  /**
-   * The speed of the CD-R[W] drive.
-   */
-    int cdrw_speed;
 
   /**

branches/3.3/mondo/src/common/newt-specific.c

@@ -1226 +1226 @@
  * Ask the user which backup media type they would like to use.
  * The choices are @p none (exit to shell), @c optical,
- * @c tape, @c cdstream, @c udev (only when @p g_text_mode is TRUE), @c netfs,
+ * @c tape, @c udev (only when @p g_text_mode is TRUE), @c netfs,
  * and @c iso.
  * @param restoring TRUE if we're restoring, FALSE if we're backing up.
@@ -1240 +1240 @@
         char *title_sz = NULL;
         char *minimsg_sz = NULL;
-        static t_bkptype possible_bkptypes[] = { none, optical, tape, cdstream, udev, netfs, iso };
-        static char *possible_responses[] = { "none", "optical", "tape", "cdstream", "udev", "netfs", "iso", NULL };
+        static t_bkptype possible_bkptypes[] = { none, optical, tape, udev, netfs, iso };
+        static char *possible_responses[] = { "none", "optical", "tape", "udev", "netfs", "iso", NULL };
         char *outstr = NULL;
         char *instr = NULL;