Changeset 3881 in MondoRescue for branches/3.3/mondo/src

Timestamp:

Mar 9, 2024, 3:31:21 PM (4 months ago)

Author:

Bruno Cornec

Message:

-c means now optical backup for CD/DVD. Removed dvd special mode -r

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-archive.c (modified) (5 diffs)
• common/libmondo-cli.c (modified) (5 diffs)
• common/libmondo-devices.c (modified) (6 diffs)
• common/libmondo-string.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• common/mondostructures.h (modified) (2 diffs)
• common/newt-specific.c (modified) (4 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -917 +917 @@
     }
 
-    if (bkpinfo->backup_media_type == cdr) {
+    if (bkpinfo->backup_media_type == optical) {
         if (is_this_device_mounted(bkpinfo->media_device)) {
             log_msg(2, "Warning - %s mounted. I'm unmounting it before I burn to it.", bkpinfo->media_device);
@@ -1089 +1089 @@
         }
         if (g_current_media_number == 1 && !res
-            && (bkpinfo->backup_media_type == cdr)) {
-            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.");
+            && (bkpinfo->backup_media_type == optical)) {
+            if ((tmp = find_optical_device()) == NULL) {    // make sure find_optical_device() finds, records CD-R's loc
+                log_msg(3, "*Sigh* no optical drive found, I hate your computer ;-)");
                 // if it can't be found then force pausing
                 bkpinfo->manual_cd_tray = TRUE;
             } else {
-                log_msg(3, "Great. Found Mike's CD-ROM drive.");
+                log_msg(3, "Great. Found an optical drive.");
             }
             mr_free(tmp);
@@ -2848 +2848 @@
 
     switch (bkpinfo->backup_media_type) {
-    case cdr:
-        mr_asprintf(value, "cdr");
+    case optical:
+        mr_asprintf(value, "optical");
         break;
     case cdstream:
@@ -2865 +2865 @@
     case netfs:
         mr_asprintf(value, "netfs");
-        break;
-    case dvd:
-        mr_asprintf(value, "dvd");
         break;
     case usb:
@@ -3180 +3177 @@
         if (bkpinfo->backup_media_type != iso) {
             mr_free(bkpinfo->media_device);
-            bkpinfo->media_device = find_optical_device();  // replace 0,0,0 with /dev/cdrom
+            bkpinfo->media_device = find_optical_device();
         }
         if (chdir("/")) {

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

@@ -204 +204 @@
     /* compulsory */
     i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
-        flag_set['t'] + flag_set['u'] + flag_set['r'] +
-        flag_set['C'] + flag_set['U'];
+        flag_set['t'] + flag_set['u'] + flag_set['U'];
     if ((i == 0) && (! bkpinfo->restore_data)) {
         retval++;
@@ -325 +324 @@
     }
 
-    if ((flag_set['c'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
+    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.");
-        }
-        if (flag_set['C']) {
-            bkpinfo->cdrw_speed = atoi(flag_val['C']);
-            if (bkpinfo->cdrw_speed < 1) {
-                fatal_error("You specified a silly speed for a CD-R[W] drive");
-            }
-            if (!flag_set['L']) {
-                log_to_screen("You must use -L with -C. Therefore I am setting it for you.");
-                flag_set['L'] = 1;
-                flag_val['L'][0] = '\0';
-            }
         } else {
             log_msg(3, "flag_val['c'] = %s", flag_val['c']);
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
-            } else if (flag_set['r']) {
-                bkpinfo->cdrw_speed = 1;    /*atoi(flag_val['r']); */
-            }
-
-            if (bkpinfo->cdrw_speed < 1) {
-                fatal_error("You specified a silly speed for a CD-R[W] drive");
+            }
+        }
+        if (!flag_set['d']) {
+            if ((bkpinfo->media_device = find_optical_device()) != NULL) {
+                flag_set['d'] = TRUE;
+                log_to_screen("I guess optical drive is at %s", bkpinfo->media_device);
+            }   
+        }
+
+        if (! bkpinfo->restore_data) {
+            if (!flag_set['s']) {
+                sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
+                strcat(flag_val['s'], "m");
+                log_to_screen("You did not specify a size (-s) for your media. I'm guessing %s.", flag_val['s']);
+                flag_set['s'] = 1;
             }
         }
@@ -369 +366 @@
         if ((!flag_set['s']) && (! bkpinfo->restore_data)) {
             fatal_error("You did not specify a size (-s) for your USB device. Aborting");
-        }
-    }
-
-    if (flag_set['r'])          // DVD
-    {
-        if (flag_set['m']) {
-            fatal_error("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
-        }
-        if (!flag_set['d']) {
-            if ((bkpinfo->media_device = find_optical_device()) != NULL) {
-                flag_set['d'] = TRUE;
-                log_to_screen("I guess DVD drive is at %s", bkpinfo->media_device);
-            }
-        }
-        if (strchr(bkpinfo->media_device, ',')) {
-            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
-        }
-        if (! bkpinfo->restore_data) {
-            if (!flag_set['s']) {
-                sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
-                strcat(flag_val['s'], "m");
-                log_to_screen("You did not specify a size (-s) for DVD. I'm guessing %s.", flag_val['s']);
-                flag_set['s'] = 1;
-            }
         }
     }
@@ -542 +515 @@
 
     if (flag_set['c']) {
-        bkpinfo->backup_media_type = cdr;
+        bkpinfo->backup_media_type = optical;
     }
     if (flag_set['C']) {
@@ -554 +527 @@
         /* Never try to eject a Network device */
         bkpinfo->please_dont_eject = TRUE;
-    }
-    if (flag_set['r']) {
-        bkpinfo->backup_media_type = dvd;
     }
     if (flag_set['t']) {

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

@@ -698 +698 @@
 /**
  * Turn @c bkpinfo->backup_media_type into a human-readable string.
- * @return The human readable string (e.g. @c cdr becomes <tt>"cdr"</tt>).
+ * @return The human readable string (e.g. @c optical becomes <tt>"optical"</tt>).
  * @note The returned string points to static storage that will be overwritten with each call.
  * @ingroup stringGroup
@@ -712 +712 @@
         mr_asprintf(output, "%s", "iso");
         break;
-    case cdr:
-        mr_asprintf(output, "%s", "cdr");
+    case optical:
+        mr_asprintf(output, "%s", "optical");
         break;
     case cdstream:
@@ -1229 +1229 @@
     } else if (media_type == tape) {
         return(find_tape_device());
-    } else if ((media_type == dvd) || (media_type == cdr)) {
+    } else if (media_type == optical) {
         return(find_optical_device());
     } else {
@@ -2017 +2017 @@
     // Tape, CD, NETFS, ...?
     srandom(getpid());
-    bkpinfo->backup_media_type = (g_restoring_live_from_cd) ? cdr : which_backup_media_type(bkpinfo->restore_data);
+    bkpinfo->backup_media_type = (g_restoring_live_from_cd) ? optical : which_backup_media_type(bkpinfo->restore_data);
     if (bkpinfo->backup_media_type == none) {
         log_to_screen("User has chosen not to backup the machine");
@@ -2070 +2070 @@
     // Find device's /dev (or SCSI) entry
     switch (bkpinfo->backup_media_type) {
-    case cdr:
-    case dvd:
+    case optical:
     case usb:
         /* Never try to eject a USB device */
@@ -2081 +2080 @@
             if (ask_me_yes_or_no("Is your computer a laptop type (manual insert of MondoRescue media)?")) {
                 bkpinfo->manual_cd_tray = TRUE;
+            }
+            if (ask_me_yes_or_no("Do you want to blank your media before burning them (RW type of media)?")) {
+                bkpinfo->wipe_media_first = TRUE;
             }
         }

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

@@ -976 +976 @@
 
     switch (type_of_bkp) {
-    case dvd:
-        mr_asprintf(type_of_backup, "DVD");
-        break;
-    case cdr:
-        mr_asprintf(type_of_backup, "CDR");
+    case optical:
+        mr_asprintf(type_of_backup, "optical");
         break;
     case tape:

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

@@ -484 +484 @@
 
 // CD-R or CD-RW
-    if (bkpinfo->backup_media_type == cdr) {
+    if (bkpinfo->backup_media_type == optical) {
         if (!bkpinfo->manual_cd_tray) {
             mr_asprintf(extra_cdrom_params, "-waiti ");

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

@@ -172 +172 @@
 typedef enum { none = 0,        ///< No type has been set yet.
     iso,                        ///< Back up to ISO images.
-    cdr,                        ///< Back up to recordable CDs (do not erase them).
-    dvd,                        ///< Back up to DVD+R[W] or DVD-R[W] disks.
-    // To be removed
-    cdstream,                   ///< Back up to recordable CDs but treat them like a tape streamer.
+    optical,                        ///< Back up to optical media
     netfs,                      ///< Back up to an NETFS mount on the local subnet.
     tape,                       ///< Back up to tapes.
@@ -339 +336 @@
   /**
    * The device we're backing up to.
-   * If backup_media_type is @b cdr, or @b cdstream, this should be the SCSI node (e.g. 0,1,0).
-   * If backup_media_type is @b dvd, @b tape, @b usb or @b udev, this should be a /dev entry.
+   * If backup_media_type is @b optical, @b tape, @b usb or @b udev, this should be a /dev entry.
    * If backup_media_type is anything else, this should be blank.
    */

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

@@ -1225 +1225 @@
 /**
  * Ask the user which backup media type they would like to use.
- * The choices are @p none (exit to shell), @c cdr, @c dvd,
+ * 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,
  * and @c iso.
@@ -1240 +1240 @@
         char *title_sz = NULL;
         char *minimsg_sz = NULL;
-        static t_bkptype possible_bkptypes[] = { none, cdr, dvd, tape, cdstream, udev, netfs, iso };
-        static char *possible_responses[] = { "none", "cdr", "dvd", "tape", "cdstream", "udev", "netfs", "iso", 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 };
         char *outstr = NULL;
         char *instr = NULL;
@@ -1248 +1248 @@
 
         newtComponent b1;
-        newtComponent b2;
         newtComponent b3;
         newtComponent b4;
-        newtComponent b5;
         newtComponent b6;
         newtComponent b7;
@@ -1288 +1286 @@
         newtPushHelpLine(title_sz);
         newtCenteredWindow(34, 17, minimsg_sz);
-        b1 = newtButton(1, 1, "CD-R disks ");
+        b1 = newtButton(1, 1, "Optical disks ");
         b3 = newtButton(1, 9, "Tape drive ");
         b4 = newtButton(17, 5, "USB Key/Disk");
-        b5 = newtButton(1, 5, " DVD disks ");
         b6 = newtButton(17, 9, " Net mount ");
         b7 = newtButton(1, 13, " Hard disk ");
         b8 = newtButton(17, 13, "    Exit   ");
         myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, b1, b5, b3, b7, b4, b6, b8, NULL);
+        newtFormAddComponents(myForm, b1, b3, b7, b4, b6, b8, NULL);
         b_res = newtRunForm(myForm);
         newtFormDestroy(myForm);
         newtPopWindow();
         if (b_res == b1) {
-            output = cdr;
+            output = optical;
         } else if (b_res == b3) {
             output = tape;
         } else if (b_res == b4) {
             output = usb;
-        } else if (b_res == b5) {
-            output = dvd;
         } else if (b_res == b6) {
             output = netfs;

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

@@ -942 +942 @@
     if (!strcmp(value, "cdstream")) {
         bkpinfo->backup_media_type = cdstream;
-    } else if (!strcmp(value, "cdr")) {
-        bkpinfo->backup_media_type = cdr;
-    } else if (!strcmp(value, "dvd")) {
-        bkpinfo->backup_media_type = dvd;
+    } else if (!strcmp(value, "optical")) {
+        bkpinfo->backup_media_type = optical;
     } else if (!strcmp(value, "usb")) {
         bkpinfo->backup_media_type = usb;
@@ -958 +956 @@
             }
             if (does_file_exist(ARCHIVES_PATH "/filelist.0")) {
-                bkpinfo->backup_media_type = cdr;
+                bkpinfo->backup_media_type = optical;
                 run_program_and_log_output("umount -d "MNT_CDROM, 1);
-                log_it("Re-jigging configuration AGAIN. CD-R, not ISO.");
+                log_it("Re-jigging configuration AGAIN. Optical, not ISO.");
             }
         }
@@ -1252 +1250 @@
             mr_asprintf(tmp1, "mount %s %s", g_isodir_device, iso_mnt);
             if (run_program_and_log_output(tmp1, 3)) {
-                log_msg(1, "Unable to mount isodir. Perhaps this is really a CD backup?");
-                bkpinfo->backup_media_type = cdr;
+                log_msg(1, "Unable to mount isodir. Perhaps this is really an optical based backup?");
+                bkpinfo->backup_media_type = optical;
                 mr_asprintf(bkpinfo->media_device, "%s", "/dev/cdrom"); /* superfluous */
                 mr_free(bkpinfo->isodir);