SVN: geninitrd/trunk: geninitrd mod-multipath.sh

[glen]

Author: glen
Date: Tue Feb  5 16:54:56 2013
New Revision: 12620

Modified:
   geninitrd/trunk/geninitrd
   geninitrd/trunk/mod-multipath.sh
Log:
no deprecated egrep

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Tue Feb  5 16:54:56 2013
@@ -300,7 +300,7 @@
 		# try cache
 		eval have='$'busybox_have_$applet
 		if [ -z "$have" ]; then
-			have=$(echo "$busybox_functions" | egrep -c "( |^)$applet(,|$)")
+			have=$(echo "$busybox_functions" | grep -Ec "( |^)$applet(,|$)")
 			if [ "$have" = 0 ]; then
 				warn "This setup requires busybox-initrd compiled with applet '$applet' support"
 				err=1

Modified: geninitrd/trunk/mod-multipath.sh
==============================================================================
--- geninitrd/trunk/mod-multipath.sh	(original)
+++ geninitrd/trunk/mod-multipath.sh	Tue Feb  5 16:54:56 2013
@@ -124,10 +124,10 @@
 		inst_exec /sbin/mpath* /sbin
 	fi
 
-	egrep -v '^([ 	]*$|#)' /etc/multipath.conf > $DESTDIR/etc/multipath.conf
+	grep -Ev '^([ 	]*$|#)' /etc/multipath.conf > $DESTDIR/etc/multipath.conf
 
 	if [ -f /etc/multipath/bindings ]; then
-		egrep -v '^([ 	]*$|#)' /etc/multipath/bindings > $DESTDIR/etc/multipath/bindings
+		grep -Ev '^([ 	]*$|#)' /etc/multipath/bindings > $DESTDIR/etc/multipath/bindings
 	else
 		touch $DESTDIR/etc/multipath/bindings
 	fi