Changeset 3881 in MondoRescue for branches/3.3/mondo/src/common/libmondo-cli.c

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

File:

• branches/3.3/mondo/src/common/libmondo-cli.c (modified) (5 diffs)

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']) {