diff options
| author | Warren Togami <wtogami@redhat.com> | 2009-06-23 17:08:39 -0400 |
|---|---|---|
| committer | Warren Togami <wtogami@redhat.com> | 2009-06-23 17:08:39 -0400 |
| commit | fb3d8cf7c234a47ed8a27bc85a93f733fd7f791d (patch) | |
| tree | 242f57a952f387f007cfb7c542702d3f8a5085c0 /test | |
| parent | d0d1ea3d875281774f7f455ad2bb2e0aa7b5c974 (diff) | |
Remove legacy nfsroot.txt derived shortcuts and accompanying tests.
(further cleanup is needed)
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-20-NFS/test.sh | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index a090b64..ee514b0 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -107,9 +107,6 @@ test_nfsv3() { client_test "NFSv3 netroot=dhcp DHCP path only" 52:54:00:12:34:00 \ "netroot=dhcp" 192.168.50.1 -wsize=4096 || return 1 - client_test "NFSv3 root=nfs DHCP path only" 52:54:00:12:34:00 \ - "root=nfs" 192.168.50.1 -wsize=4096 || return 1 - client_test "NFSv3 root=/dev/nfs DHCP path only" 52:54:00:12:34:00 \ "root=/dev/nfs" 192.168.50.1 -wsize=4096 || return 1 @@ -119,9 +116,6 @@ test_nfsv3() { client_test "NFSv3 root=dhcp DHCP IP:path" 52:54:00:12:34:01 \ "root=dhcp" 192.168.50.2 -wsize=4096 || return 1 - client_test "NFSv3 root=nfs DHCP IP:path" 52:54:00:12:34:01 \ - "root=nfs" 192.168.50.2 -wsize=4096 || return 1 - client_test "NFSv3 root=/dev/nfs DHCP IP:path" 52:54:00:12:34:01 \ "root=/dev/nfs" 192.168.50.2 -wsize=4096 || return 1 @@ -160,18 +154,6 @@ test_nfsv4() { # server, so put these later in the list to avoid a pause when doing # switch_root - client_test "NFSv4 netroot=nfs4 DHCP path only" 52:54:00:12:34:80 \ - "netroot=nfs4" 192.168.50.1 -wsize=4096 || return 1 - - 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 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 netroot=dhcp DHCP proto:IP:path" 52:54:00:12:34:82 \ "netroot=dhcp" 192.168.50.3 -wsize=4096 || return 1 @@ -192,18 +174,6 @@ test_nfsv4() { "root=nfs4:192.168.50.1:/client" 192.168.50.1 \ -wsize=4096 || return 1 - client_test "NFSv4 netroot=nfs4" 52:54:00:12:34:84 \ - "netroot=nfs4" 192.168.50.1 -wsize=4096 || return 1 - - client_test "NFSv4 root=nfs4" 52:54:00:12:34:84 \ - "root=nfs4" 192.168.50.1 -wsize=4096 || return 1 - - client_test "NFSv4 root=nfs4 DHCP path,options" \ - 52:54:00:12:34:85 "root=nfs4" 192.168.50.1 wsize=4096 || return 1 - - client_test "NFSv4 root=nfs4 DHCP IP:path,options" \ - 52:54:00:12:34:86 "root=nfs4" 192.168.50.2 wsize=4096 || return 1 - client_test "NFSv4 root=dhcp DHCP proto:IP:path,options" \ 52:54:00:12:34:87 "root=dhcp" 192.168.50.3 wsize=4096 || return 1 } |