Changeset 687 in MondoRescue for trunk/mondo/mondo/restore-scripts/mondo

Timestamp:

Jul 17, 2006, 3:39:42 PM (18 years ago)

Author:

bcornec

Message:

merge -r671:686 $SVN_M/branches/stable

Location:

trunk/mondo/mondo/restore-scripts/mondo

Files:

• make-me-bootable (modified) (1 diff)
• mount-me (modified) (1 diff)

trunk/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`

trunk/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