Changeset 3654 in MondoRescue for branches

Timestamp:

Mar 8, 2017, 3:56:44 PM (8 years ago)

Author:

Bruno Cornec

Message:

Fix an eror when restoring live, bkpinfo->media_device is left empty and what_number_cd_is_this wasn't computing the right value.

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-devices.c (modified) (2 diffs)
• libmondo-tools.c (modified) (1 diff)

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

@@ -3006 +3006 @@
     assert(bkpinfo != NULL);
 //  log_it("Asking what_number_cd_is_this");
-    if (g_ISO_restore_mode) {
+    if ((g_ISO_restore_mode) || (g_restoring_live_from_cd)) {
         tmp = call_program_and_get_last_line_of_output("mount | grep iso9660 | awk '{print $3;}'");
         mr_asprintf(mountdev, "%s%s", tmp, "/archives/THIS-CD-NUMBER");
@@ -3016 +3016 @@
     }
 
+    if (!bkpinfo->media_device[0]) {
+        log_it("ERROR: bkpinfo->media_device shoulnd't be empty here\n");
+        return(0);
+    }
     mr_asprintf(mountdev, "%s", bkpinfo->media_device);
     if (!mountdev[0]) {

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

@@ -1189 +1189 @@
     log_msg(4, "About to set g_boot_mountpt[0] to '\\0'");
     g_boot_mountpt[0] = '\0';
-    log_msg(4, "Done. Great. Seeting command to something");
+    log_msg(4, "Done. Great. Setting command to something");
     mr_asprintf(command, "%s", "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);