From 950086e9878534cca27c3914057a11e16bb9832e Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 1 Jul 2009 17:49:50 +0200
Subject: [PATCH] do not assume nfs for root=/dev/... but for /dev/nfs

---
 modules.d/95nfs/parse-nfsroot.sh |  4 +++-
 test/TEST-20-NFS/test.sh         | 11 +++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh
index f05fb2a..c1f404f 100755
--- a/modules.d/95nfs/parse-nfsroot.sh
+++ b/modules.d/95nfs/parse-nfsroot.sh
@@ -93,8 +93,10 @@ if [ -n "$nfsroot" ] ; then
     netroot=nfs:$nfsroot;
 fi
 
-# LEGACY convert root=<server-ip>:/<path
 case "$netroot" in
+    /dev/nfs) netroot=nfs;;
+    /dev/*) return;;
+# LEGACY: root=<server-ip>:/<path
     [0-9]*:/*|[0-9]*\.[0-9]*\.[0-9]*[!:]|/*)
        netroot=nfs:$netroot;;
 esac
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index a161acb..d57e4f3 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -107,12 +107,11 @@ test_nfsv3() {
     client_test "NFSv3 Legacy root=/dev/nfs nfsroot=IP:path" 52:54:00:12:34:01 \
  	"root=/dev/nfs nfsroot=192.168.50.1:/nfs/client" 192.168.50.1 -wsize=4096 || return 1
 
-# XXX Fix me
-#    client_test "NFSv3 Legacy root=/dev/nfs DHCP path only" 52:54:00:12:34:00 \
-# 	"root=/dev/nfs" 192.168.50.1 -wsize=4096 || return 1
-#
-#    client_test "NFSv3 Legacy root=/dev/nfs DHCP IP:path" 52:54:00:12:34:01 \
-# 	"root=/dev/nfs" 192.168.50.2 -wsize=4096 || return 1
+    client_test "NFSv3 Legacy root=/dev/nfs DHCP path only" 52:54:00:12:34:00 \
+	"root=/dev/nfs" 192.168.50.1 -wsize=4096 || return 1
+
+    client_test "NFSv3 Legacy root=/dev/nfs DHCP IP:path" 52:54:00:12:34:01 \
+	"root=/dev/nfs" 192.168.50.2 -wsize=4096 || return 1
 
     client_test "NFSv3 root=dhcp DHCP IP:path" 52:54:00:12:34:01 \
  	"root=dhcp" 192.168.50.2 -wsize=4096 || return 1
-- 
2.7.4