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

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

@@ -874 +874 @@
     log_msg(6, "tmp = %s", tmp);
 
-    tmp1 = call_program_and_get_last_line_of_output(tmp);
+    tmp1 = call_program_and_get_last_line_of_output(tmp,TRUE);
     mr_free(tmp);
 
@@ -1377 +1377 @@
 
         mr_asprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
-        tmp1 = call_program_and_get_last_line_of_output(tmp);
+        tmp1 = call_program_and_get_last_line_of_output(tmp,TRUE);
         mr_free(tmp);
 
@@ -1545 +1545 @@
         }
         make_hole_for_file(sz_datefile);
-        tmp1 = call_program_and_get_last_line_of_output("date +%s");
+        tmp1 = call_program_and_get_last_line_of_output("date +%s",TRUE);
         write_one_liner_data_file(sz_datefile, tmp1);
         mr_free(tmp1);
@@ -1572 +1572 @@
         }
         log_msg(1, "Calculating filelist");
-        tmp2 = call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'");
+        tmp2 = call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'",TRUE);
         if (strlen(tmp2) < 1) {
             mr_asprintf(tmp1," ");
@@ -1579 +1579 @@
             mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
             mr_free(tmp2);
-            tmp2 = call_program_and_get_last_line_of_output(tmp1);
+            tmp2 = call_program_and_get_last_line_of_output(tmp1,TRUE);
             log_msg(2, "Found windows files: %s",tmp2);
         }