Changeset 2704 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.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/common/libmondo-archive.c (modified) (7 diffs)

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -612 +612 @@
 
 #ifdef __FreeBSD__
-        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'");
+        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'",TRUE);
         if (!bootdev[0]) {
             mr_free(bootdev);
-            bootdev = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'");
+            bootdev = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'",TRUE);
         }
 #else
         /* Linux */
 #ifdef __IA64__
-        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
+        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'",TRUE);
 #else
-        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
+        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'",TRUE);
 #endif
         if (strstr(bootdev, "/dev/cciss/")) {
             mr_free(bootdev);
 #ifdef __IA64__
-            bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
+            bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1",TRUE);
 #else
-            bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
+            bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1",TRUE);
 #endif
         }
         if (!bootdev[0]) {
             mr_free(bootdev);
-            bootdev = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
+            bootdev = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'",TRUE);
             if (strstr(bootdev, "/dev/cciss/")) {
                 mr_free(bootdev);
-                bootdev = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
+                bootdev = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1",TRUE);
             }
         }
@@ -840 +840 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(command, "cp -f /%s/images/mindi.iso %s/mondorescue.iso", MINDI_CACHE_REL, MINDI_CACHE);
+        mr_asprintf(command, "cp -f /%s/mindi.iso %s/mondorescue.iso", MINDI_CACHE_REL, MINDI_CACHE);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -866 +866 @@
         log_to_screen("Mindi failed to create your boot+data disks.");
         mr_asprintf(command, "grep 'Fatal error' /var/log/mindi.log");
-        tmp = call_program_and_get_last_line_of_output(command);
+        tmp = call_program_and_get_last_line_of_output(command,TRUE);
         mr_free(command);
 
@@ -1125 +1125 @@
     mr_asprintf(data_disks_file, "/%s/all.tar.gz", MINDI_CACHE_REL);
 
-    g_serial_string = call_program_and_get_last_line_of_output("dd  if=/dev/urandom bs=16 count=1 2> /dev/null |  hexdump | tr -s ' ' '0' | head -n1");
+    g_serial_string = call_program_and_get_last_line_of_output("dd  if=/dev/urandom bs=16 count=1 2> /dev/null |  hexdump | tr -s ' ' '0' | head -n1",TRUE);
     mr_strip_spaces(g_serial_string);
     mr_strcat(g_serial_string, "...word.");
@@ -1811 +1811 @@
     mr_asprintf(command, "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1", bigfile_fname);
     log_msg(1, "command = '%s'", command);
-    tmp = call_program_and_get_last_line_of_output(command);
+    tmp = call_program_and_get_last_line_of_output(command,TRUE);
     mr_free(command);
 
@@ -2544 +2544 @@
             mr_asprintf(tmp, "cat %s 2> /dev/null", szserfname);
             mr_free(our_serial_str);
-            our_serial_str = call_program_and_get_last_line_of_output(tmp);
+            our_serial_str = call_program_and_get_last_line_of_output(tmp,TRUE);
             mr_free(tmp);
             // FIXME - should be able to use last_line_of_file(), surely?
@@ -2733 +2733 @@
         mr_asprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
         log_it("command = %s", command);
-        tmp = call_program_and_get_last_line_of_output(command);
+        tmp = call_program_and_get_last_line_of_output(command,TRUE);
         mr_free(command);
         log_it("res of it = %s", tmp);