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

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

File:

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

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