Changeset 3350 in MondoRescue for branches/3.2/mondo/src

Timestamp:

Feb 27, 2015, 3:14:40 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix #769 by asking in newt mode whether the kernel found by mindi is the one the sysadmin want's to use

Location:

branches/3.2/mondo/src/common

Files:

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

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

@@ -2755 +2755 @@
             bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
         }
+#if __FreeBSD__ == 5
+        strcpy(bkpinfo->kernel_path, "/boot/kernel/kernel");
+#elif __FreeBSD__ == 4
+        strcpy(bkpinfo->kernel_path, "/kernel");
+#elif linux
+        if (figure_out_kernel_path_interactively_if_necessary(bkpinfo->kernel_path)) {
+            fatal_error("Kernel not found. Please specify manually with the '-k' switch.");
+        }
+#else
+#error "I don't know about this system!"
+#endif
+
 
         bkpinfo->verify_data =

branches/3.2/mondo/src/common/libmondo-files.c

@@ -29 +29 @@
 extern int g_currentY;
 extern char *g_mondo_home;
+
+extern bool g_text_mode;
 
 /* Reference to global bkpinfo */
@@ -288 +290 @@
         mr_free(tmp);
         mr_free(command);
-    }
+    } else {
+        // If we've found the kernel, allow sysadmin to modify it if he wants
+        if (!g_text_mode) {
+            if (!popup_and_get_string("Kernel path", "We found this full path name for your kernel. You should just use it in most cases", kernel, MAX_STR_LEN / 4)) {
+                fatal_error("Kernel not found. Please specify with the '-k' flag.");
+            }
+        }
+    }
+    log_it("User says kernel is at %s", kernel);
+
     log_it("Calling Mindi with kernel path of '%s'", kernel);
     while (!kernel[0]) {