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

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

@@ -225 +225 @@
     d = 5.2;                    // :-)
 #else
-    tmp = call_program_and_get_last_line_of_output("uname -r");
+    tmp = call_program_and_get_last_line_of_output("uname -r",TRUE);
     p = strchr(tmp, '.');
     if (p) {
@@ -476 +476 @@
         if (getenv ("SUDO_COMMAND")) {
             mr_asprintf(command, "strings `which growisofs` | grep -c SUDO_COMMAND");
-            tmp = call_program_and_get_last_line_of_output(command);
+            tmp = call_program_and_get_last_line_of_output(command,TRUE);
             if (!strcmp(tmp, "1")) {
                 mr_free(command);
@@ -575 +575 @@
         mr_asprintf(command, "df -P %s | tail -n1 | cut -d' ' -f1", bkpinfo->isodir);
         log_it("command = %s", command);
-        iso_dev = call_program_and_get_last_line_of_output(command);
+        iso_dev = call_program_and_get_last_line_of_output(command,TRUE);
         log_it("res of it = %s", iso_dev);
         mr_free(command);
@@ -583 +583 @@
 
         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);
@@ -858 +858 @@
 
     mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4", partition);
-    out_sz = call_program_and_get_last_line_of_output(command);
+    out_sz = call_program_and_get_last_line_of_output(command,TRUE);
     mr_free(command);
 
@@ -900 +900 @@
         run_program_and_log_output("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
     }
-    tmp = call_program_and_get_last_line_of_output("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2");
+    tmp = call_program_and_get_last_line_of_output("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2",TRUE);
     if (atol(tmp) < 35000) {
         retval++;
@@ -961 +961 @@
 
     run_program_and_log_output("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    tmp = call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\"");
+    tmp = call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\"",TRUE);
     if (strcmp("", tmp)) {
         if (strstr(tmp, "autofs")) {
@@ -1046 +1046 @@
     } else {
         mr_asprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5", label, config_file);
-        value = call_program_and_get_last_line_of_output(command);
+        value = call_program_and_get_last_line_of_output(command,TRUE);
         mr_free(command);
 
@@ -1175 +1175 @@
     mr_asprintf(command, "%s", "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. 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);
 
@@ -1182 +1182 @@
     mr_asprintf(command, "mount | grep -Ew '/boot'");
     mr_free(tmp);
-    tmp = call_program_and_get_last_line_of_output(command);
+    tmp = call_program_and_get_last_line_of_output(command,TRUE);
     mr_free(command);
 
@@ -1381 +1381 @@
     char *tmp = NULL;
 
-    tmp = call_program_and_get_last_line_of_output("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99");
+    tmp = call_program_and_get_last_line_of_output("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99",TRUE);
 
     strcpy(g_magicdev_command, tmp);