SVN: rc-scripts/trunk/rc.d/init.d/functions

[baggins]

Author: baggins
Date: Mon Mar  9 22:03:05 2009
New Revision: 10183

Modified:
   rc-scripts/trunk/rc.d/init.d/functions
Log:
- man grep, glen. "Direct invocation as either egrep or fgrep is deprecated"
- and better safe than sorry, use grep -E with proper regexp


Modified: rc-scripts/trunk/rc.d/init.d/functions
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/functions	(original)
+++ rc-scripts/trunk/rc.d/init.d/functions	Mon Mar  9 22:03:05 2009
@@ -999,7 +999,7 @@
 	[ -n "$fstype" -a -n "$mntpoint" ] || return 1
 
 	if [ -r /proc/mounts ]; then
-		fgrep -q " $mntpoint $fstype " /proc/mounts
+		grep -qE "[ \t]$mntpoint[ \t]+$fstype[ \t]" /proc/mounts
 		return $?
 	else
 		if [ "$(/bin/stat -L -f -c %T $mntpoint 2>/dev/null)" = "$fstype" ]; then