Changeset 914 in MondoRescue for trunk/mondo/src/common/libmondo-tools.c

Timestamp:

Nov 2, 2006, 2:00:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r902:913 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-tools.c (modified) (4 diffs)

trunk/mondo/src/common/libmondo-tools.c

@@ -404 +404 @@
 #else
     tmp = call_program_and_get_last_line_of_output
-             ("free | grep \":\" | tr -s ' ' '\t' | cut -f2 | head -n1");
+             ("free | grep ':' | tr -s ' ' '\t' | cut -f2 | head -n1");
     avm += atol(tmp);
     mr_free(tmp);
@@ -1110 +1110 @@
     log_msg(4, "Setting command to something");
     mr_asprintf(&command,
-             "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+             "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);
@@ -1127 +1127 @@
             }
         } else {
-            mr_asprintf(&command, "mount | grep -w \"%s\"", tmp);
+            mr_asprintf(&command, "mount | grep -E '^%s'", tmp);
             log_msg(3, "command = %s", command);
             if (run_program_and_log_output(command, 5)) {
@@ -1215 +1215 @@
              ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX");
     if (does_file_exist(config_file)) {
-        mr_asprintf(&command, "grep -vx '%s .*' %s > %s",
+        mr_asprintf(&command, "grep -vE '^%s .*$' %s > %s",
                 label, config_file, tempfile);
         paranoid_system(command);