Changeset 392 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-files.c

Timestamp:

Feb 15, 2006, 9:39:26 AM (18 years ago)

Author:

andree

Message:

Made it so that mondoarchive aborts when 'mindi --findkernel' gives a
fatal error and outputs mindi's fatal error message in a newt popup.
This should help making it easier for users to get to the core of the
problem in case mindi fails.
(See also Debian bug #352323.)

File:

• branches/stable/mondo/mondo/common/libmondo-files.c (modified) (2 diffs)

branches/stable/mondo/mondo/common/libmondo-files.c

@@ -341 +341 @@
 {
     char tmp[MAX_STR_LEN];
+    char *command;
 
     if (!kernel[0]) {
@@ -346 +347 @@
                call_program_and_get_last_line_of_output
                ("mindi --findkernel 2> /dev/null"));
+    }
+    // If we didn't get anything back, check whether mindi raised a fatal error
+    if (!kernel[0]) {
+        malloc_string(command);
+        strcpy(command, "grep 'Fatal error' /var/log/mindi.log");
+        strcpy(tmp, call_program_and_get_last_line_of_output(command));
+        if (strlen(tmp) > 1) {
+            popup_and_OK(tmp);
+            fatal_error("Mindi gave a fatal error. Please check '/var/log/mindi.log'.");
+        }
+        paranoid_free(command);
     }
     log_it("Calling Mindi with kernel path of '%s'", kernel);