kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove legacy nfsroot.txt derived shortcuts and accompanying tests. 

(further cleanup is needed)
master
Warren Togami 2009-06-23 17:08:39 -04:00
parent d0d1ea3d87
commit fb3d8cf7c2
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules.d/95nfs/nfsroot
View File

@ -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

30
test/TEST-20-NFS/test.sh
View File

@ -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
}