Changeset 680 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-tools.c

Timestamp:

Jun 25, 2006, 3:56:38 AM (18 years ago)

Author:

andree

Message:

Replace occurrences of 'grep -v ... | grep -v ... | ...' with 'grep -Ev
...' for efficiency reasons and to ease trouble-shooting.

This also fixes Debian bug #222052.

File:

• branches/stable/mondo/mondo/common/libmondo-tools.c (modified) (1 diff)

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

@@ -1130 +1130 @@
     // abort if Windows partition but no ms-sys and parted
     if (!run_program_and_log_output
-        ("mount | grep -w vfat | grep -v /dev/fd | grep -v nexdisk", 0)
+        ("mount | grep -w vfat | grep -vE \"/dev/fd|nexdisk\"", 0)
         ||
         !run_program_and_log_output
-        ("mount | grep -w dos | grep -v /dev/fd | grep -v nexdisk", 0)) {
+        ("mount | grep -w dos | grep -vE \"/dev/fd|nexdisk\"", 0)) {
         log_to_screen("I think you have a Windows 9x partition.");
         retval += whine_if_not_found("parted");