Changeset 2704 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

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

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (3 diffs)
• mondo-rstr-compare.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (4 diffs)
• mondorestore.c (modified) (6 diffs)
• mr-externs.h (modified) (1 diff)

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);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -631 +631 @@
   /** needs malloc **/
     char *dir;
-    char *command = NULL;
 
     assert(bkpinfo != NULL);
@@ -683 +682 @@
     int res;
     char *dir;
-    char *command = NULL;
 
     assert(bkpinfo != NULL);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -719 +719 @@
         mr_free(value);
     
-        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, "pxe")) {
             /* We need to override prefix value in PXE mode as it's 
@@ -904 +904 @@
 
 tmp = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "please-dont-eject");
-tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
+tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE);
 if (tmp || strstr(tmp1, "donteject")) {
     bkpinfo->please_dont_eject = TRUE;
@@ -938 +938 @@
         }
     }
-    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
+    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE);
     if (strstr(tmp1, "pxe")) {
         mr_free(tmp1);
@@ -997 +997 @@
             mr_asprintf(command, "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", g_isodir_device);
             log_it("command = %s", command);
-            iso_mnt = call_program_and_get_last_line_of_output(command);
+            iso_mnt = call_program_and_get_last_line_of_output(command,TRUE);
             log_it("res of it = %s", iso_mnt);
             mr_free(command);

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

@@ -448 +448 @@
     log_it("Done loading config file; resizing ML");
 
-    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
+    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE);
     if (strstr(tmp1, "noresize")) {
         log_msg(1, "Not resizing mountlist.");
@@ -742 +742 @@
     load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt"); // in case read_cfg_file_into_bkpinfo updated the mountlist
 
-    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, "noresize")) {
         log_msg(2, "Not resizing mountlist.");
@@ -777 +777 @@
             twenty_seconds_til_yikes();
             g_fprep = fopen("/tmp/prep.sh", "w");
-            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, "nopart")) {
                 log_msg(2, "Not partitioning drives due to 'nopart' option.");
@@ -850 +850 @@
 
   after_the_nuke:
-    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
+    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE);
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
@@ -2589 +2589 @@
     /* Configure global variables */
     malloc_libmondo_global_strings();
-    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
+    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE);
     if (strstr(tmp1, "textonly")) {
         g_text_mode = TRUE;
@@ -2601 +2601 @@
     setup_newt_stuff();         /* call newtInit and setup screen log */
 
-    tmp1 = call_program_and_get_last_line_of_output("which mondorestore");
+    tmp1 = call_program_and_get_last_line_of_output("which mondorestore",TRUE);
     strcpy(g_mondo_home, tmp1);
     mr_free(tmp1);

branches/2.2.10/mondo/src/mondorestore/mr-externs.h

@@ -18 +18 @@
 extern int closein_tape();
 extern void close_evalcall_form(void);
-extern char *call_program_and_get_last_line_of_output(char *);
+extern char *call_program_and_get_last_line_of_output(char *,bool);
 extern void close_progress_form(void);
 extern long count_lines_in_file(char *);