Remove dracut invented variations of Legacy nfsroot.txt syntax and accompanying tests.

- Remove root=nfs nfsroot=...
- Remove root=nfs4 nfsroot=...
- Remove root=/dev/nfs4 nfsroot=...
- Legacy nfsroot= without root=/dev/nfs should be unsupported according to the nfsroot.txt.
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/filesystems/nfsroot.txt
45 root=/dev/nfs
46
47   This is necessary to enable the pseudo-NFS-device. Note that it's not a
48   real device but just a synonym to tell the kernel to use NFS instead of
49   a real device.

1 files changed, 0 insertions, 42 deletions

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index ff11f27b..a090b64f 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -141,32 +141,10 @@ test_nfsv3() {
     client_test "NFSv3 root=nfs:..." 52:54:00:12:34:04 \
  	"root=nfs:192.168.50.1:/nfs/client" 192.168.50.1 -wsize=4096 || return 1
 
-    client_test "NFSv3 nfsroot=/nfs/client" 52:54:00:12:34:04 \
-	"nfsroot=/nfs/client" 192.168.50.1 -wsize=4096 || return 1
-
-    client_test "NFSv3 nfsroot=192.168.50.2:/nfs/client" 52:54:00:12:34:04 \
-	"nfsroot=192.168.50.2:/nfs/client" 192.168.50.2 -wsize=4096 || return 1
-
     # This test must fail: root=dhcp must ignore other arguments
     client_test "NFSv3 root=dhcp nfsroot=/nfs/client" 52:54:00:12:34:04 \
 	"root=dhcp nfsroot=/nfs/client" 192.168.50.1 -wsize=4096 && return 1
 
-    client_test "NFSv3 root=nfs nfsroot=/nfs/client" 52:54:00:12:34:04 \
-	"root=nfs nfsroot=/nfs/client" 192.168.50.1 -wsize=4096 || return 1
-
-    client_test "NFSv3 root=nfs nfsroot=/nfs/%s" 52:54:00:12:34:04 \
-	"root=nfs nfsroot=/nfs/%s" 192.168.50.1 -wsize=4096 || return 1
-
-    client_test "NFSv3 root=nfs nfsroot=/nfs/ip/%s no host name (use IP)" \
-	52:54:00:12:34:7f \
-	"root=nfs nfsroot=/nfs/ip/%s \
-		ip=192.168.50.101:192.168.50.1::255.255.255.0::eth0:off" \
-	192.168.50.1 -wsize=4096 || return 1
-
-    client_test "NFSv3 root=nfs nfsroot=/nfs/client,wsize=4096" \
-	52:54:00:12:34:04 "root=nfs nfsroot=/nfs/client,wsize=4096" \
-	192.168.50.1 wsize=4096 || return 1
-
     client_test "NFSv3 root=dhcp DHCP path,options" \
 	52:54:00:12:34:05 "root=dhcp" 192.168.50.1 wsize=4096 || return 1
 
@@ -188,18 +166,12 @@ test_nfsv4() {
     client_test "NFSv4 root=nfs4 DHCP path only" 52:54:00:12:34:80 \
   	"root=nfs4" 192.168.50.1 -wsize=4096 || return 1
 
-    client_test "NFSv4 root=/dev/nfs4 DHCP path only" 52:54:00:12:34:80 \
-  	"root=/dev/nfs4" 192.168.50.1 -wsize=4096 || return 1
-
     client_test "NFSv4 netroot=nfs4 DHCP IP:path" 52:54:00:12:34:81 \
   	"netroot=nfs4" 192.168.50.2 -wsize=4096 || return 1
 
     client_test "NFSv4 root=nfs4 DHCP IP:path" 52:54:00:12:34:81 \
   	"root=nfs4" 192.168.50.2 -wsize=4096 || return 1
 
-    client_test "NFSv4 root=/dev/nfs4 DHCP IP:path" 52:54:00:12:34:81 \
-  	"root=/dev/nfs4" 192.168.50.2 -wsize=4096 || return 1
-
     client_test "NFSv4 netroot=dhcp DHCP proto:IP:path" 52:54:00:12:34:82 \
  	"netroot=dhcp" 192.168.50.3 -wsize=4096 || return 1
 
@@ -220,20 +192,6 @@ test_nfsv4() {
 	"root=nfs4:192.168.50.1:/client" 192.168.50.1 \
 	-wsize=4096 || return 1
 
-    client_test "NFSv4 root=nfs4 nfsroot=/client" 52:54:00:12:34:84 \
-	"root=nfs4 nfsroot=/client" 192.168.50.1 -wsize=4096 || return 1
-
-    client_test "NFSv4 root=nfs4 nfsroot=192.168.50.2:/client" \
-	52:54:00:12:34:84 "root=nfs4 nfsroot=192.168.50.2:/client" \
-	192.168.50.2 -wsize=4096 || return 1
-
-    client_test "NFSv4 root=nfs4 nfsroot=path,opts" \
-	52:54:00:12:34:84 "root=nfs4 nfsroot=/client,wsize=4096" \
-	192.168.50.1 wsize=4096 || return 1
-
-    # These two only work with NFSv4 in the test suite -- NFSv3 needs
-    # a /nfs prefix due to our server configuration
-
     client_test "NFSv4 netroot=nfs4" 52:54:00:12:34:84 \
 	"netroot=nfs4" 192.168.50.1 -wsize=4096 || return 1