Changeset 2704 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Jan 27, 2011, 7:31:24 PM (13 years ago)

Author:

Bruno Cornec

Message:

r4180@localhost: bruno | 2011-01-27 10:26:41 +0100

• Fix multiple port issues from 2.2.9 that prevented mindi to work
• Change interface of call_program_and_get_last_line_of_output to allow not logging (call to mindi)
• Status is working boot, but NFS interface broken due to conf file issues

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-prep.c (modified) (3 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -213 +213 @@
 #endif
 
-    tmp = call_program_and_get_last_line_of_output("cat "CMDLINE);
+    tmp = call_program_and_get_last_line_of_output("cat "CMDLINE,TRUE);
     if (strstr(tmp, "nolvm")) {
         mr_free(tmp);
@@ -336 +336 @@
             if (lvmversion == 2) {
                 mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
-                tmp = call_program_and_get_last_line_of_output(tmp1);
+                tmp = call_program_and_get_last_line_of_output(tmp1,TRUE);
                 mr_free(tmp1);
             } else {
                 mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
-                tmp = call_program_and_get_last_line_of_output(tmp1);
+                tmp = call_program_and_get_last_line_of_output(tmp1,TRUE);
                 mr_free(tmp1);
             }
@@ -1579 +1579 @@
     if (pout_to_fdisk) {
         // mark relevant partition as bootable
-        tmp1 = call_program_and_get_last_line_of_output ("make-me-bootable "MINDI_CACHE"/mountlist.txt dummy");
+        tmp1 = call_program_and_get_last_line_of_output ("make-me-bootable "MINDI_CACHE"/mountlist.txt dummy",TRUE);
         mr_asprintf(tmp, "a\n%s\n", tmp1);
         mr_free(tmp1);