Changeset 909 in MondoRescue

Timestamp:

Nov 1, 2006, 1:28:11 AM (17 years ago)

Author:

Bruno Cornec

Message:

Remove calls to grep -w when use in mondorestore as busybox doesn't support that option. (report from Alfred Chua)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/stable/mondo/src/common/libmondo-devices.c

@@ -1530 +1530 @@
     }
     paranoid_pclose(fin);
-    sprintf(tmp, "%s | grep -w \"%s\" > /dev/null 2> /dev/null",
+    sprintf(tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null",
             SWAPLIST_COMMAND, device_with_space);
     log_msg(4, "tmp (command) = '%s'", tmp);

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

@@ -1396 +1396 @@
     log_msg(4, "Done. Great. Seeting command to something");
     strcpy(command,
-           "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+           "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
@@ -1410 +1410 @@
             }
         } else {
-            sprintf(command, "mount | grep -w \"%s\"", tmp);
+            sprintf(command, "mount | grep -E \"^%s\"", tmp);
             log_msg(3, "command = %s", command);
             if (run_program_and_log_output(command, 5)) {

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

@@ -1207 +1207 @@
                 /* Find out where it's mounted */
                 sprintf(command,
-                        "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
+                        "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3",
                         g_isodir_device);
                 log_it("command = %s", command);