Changeset 680 in MondoRescue

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.

Location:

branches/stable/mondo/mondo

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• restore-scripts/mondo/make-me-bootable (modified) (1 diff)
• restore-scripts/mondo/mount-me (modified) (1 diff)

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

@@ -2523 +2523 @@
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | grep -v /dev/shm | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 

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");

branches/stable/mondo/mondo/restore-scripts/mondo/make-me-bootable

@@ -18 +18 @@
 
 HAVE_ACTIVE="false"
-for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -v "/dev/fd" | grep -v "none" | grep -v "#"` ; do
+for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -vE "/dev/fd|none|#"` ; do
     mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
     format=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f3`

branches/stable/mondo/mondo/restore-scripts/mondo/mount-me

@@ -14 +14 @@
 fi
 
-paths=`grep -v " raid " $mountlist | grep -v "lvm lvm" | tr -s ' ' ' ' | cut -d' ' -f2 | sort`
+paths=`grep -vE " raid |lvm lvm" $mountlist | tr -s ' ' ' ' | cut -d' ' -f2 | sort`
 > $mountlist.sorted
 for i in $paths ; do