Changeset 1594 in MondoRescue for branches/stable/mondo/src/mondorestore/mondorestore.c

Timestamp:

Aug 26, 2007, 12:26:06 PM (17 years ago)

Author:

Bruno Cornec

Message:

Use of conf file entries (iso_burning_*, media_device, media_size)
and adapatation of the rest of the code to that (including bkpinfo)

File:

• branches/stable/mondo/src/mondorestore/mondorestore.c (modified) (3 diffs)

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -912 +912 @@
     }
     interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    if (!bkpinfo->media_device[0]) {
+    if (!bkpinfo->media_device) {
         mr_msg(2, "Warning - failed to find media dev");
     } else {
@@ -954 +954 @@
     }
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    if ((!bkpinfo->please_dont_eject) && (bkpinfo->media_device != NULL)) {
+    if ((!bkpinfo->please_dont_eject) && (bkpinfo->media_device)) {
         eject_device(bkpinfo->media_device);
     }
@@ -3037 +3037 @@
     if (argc == 3 && strcmp(argv[1], "--paa") == 0) {
         g_current_media_number = atoi(argv[2]);
-        pause_and_ask_for_cdr(5, NULL);
+        pause_and_ask_for_cdr(5);
         paranoid_MR_finish(0);
     } else if (!bkpinfo->disaster_recovery) {   // live!