Remove legacy nfsroot.txt derived shortcuts and accompanying tests.

(further cleanup is needed)

diff --git a/modules.d/95nfs/nfsroot b/modules.d/95nfs/nfsroot
index 6012598f696392feab3c6648a173143ba1ddeaee..d95e3c040eb3cd621430e131d7663b1354156a54 100755 (executable)
--- a/modules.d/95nfs/nfsroot
+++ b/modules.d/95nfs/nfsroot
@@ -69,14 +69,6 @@ case "${root%%:*}" in
     *) return;;
 esac
 
-# Ugly: root=nfs[4] requires dhcp root-path
-if [ "$root" = "nfs" ] || [ "$root" = "nfs4" ] ; then
-    # No need to check if the file exists. ip cmdline parser takes care of this
-    . /tmp/dhclient.$netif.dhcpopts
-    [ -z "$new_root_path" ] && die "Required dhcp option root-path not available"
-    root=$root:$new_root_path
-fi 
-
 root_to_var $root
 
 #Load other data that might provide info

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index a090b64f33322209d7680bf4fab9f1853e232c77..ee514b061c6fee904ffd62882eb05d797bbf4846 100755 (executable)
--- 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
 }