SVN: geninitrd/trunk/mod-nfs.sh

[glen]

Author: glen
Date: Fri Apr  3 01:29:33 2009
New Revision: 10297

Modified:
   geninitrd/trunk/mod-nfs.sh
Log:
- fix nfsroot detection

Modified: geninitrd/trunk/mod-nfs.sh
==============================================================================
--- geninitrd/trunk/mod-nfs.sh	(original)
+++ geninitrd/trunk/mod-nfs.sh	Fri Apr  3 01:29:33 2009
@@ -11,11 +11,11 @@
 is_nfs() {
 	local node="$1"
 
-	if is_yes "`echo "$node" | awk '/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:|\/dev\/nfs)/ { print "yes"; }'`"; then
-		return 1
+	if is_yes "$(awk -vnode="$node" 'BEGIN { if (node ~ /^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:|\/dev\/nfs)/) print "yes" }')"; then
+		return 0
 	fi
 
-	return 0
+	return 1
 }
 
 # find modules for for nfs
@@ -33,7 +33,7 @@
 	else
 		local m
 		[ -z "$NFS_ETH_MODULES" ] && NFS_ETH_MODULES=$(/usr/bin/pcidev /m net | xargs)
-		warn "NOTE: Network card(s) module(s) $NFS_ETH_MODULES is for this machine"
+		msg "NOTE: Network card(s) module(s) $NFS_ETH_MODULES is for this machine"
 		for m in $NFS_ETH_MODULES; do
 			find_module "$m"
 		done