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.master
Warren Togami
parent
9794cf831b
commit
5655a3ffbf
|
|
@ -2,12 +2,13 @@
|
|||
#
|
||||
# Preferred format:
|
||||
# root=nfs[4]:[server:]path[:options]
|
||||
# FIXME: What is the below referring to other than root=dhcp?
|
||||
# [root=*] netroot=nfs[4]:[server:]path[:options]
|
||||
#
|
||||
# Legacy formats:
|
||||
# [net]root=[[/dev/]nfs[4]] nfsroot=[server:]path[,options]
|
||||
# [net]root=[[/dev/]nfs[4]] nfsroot=[server:]path[:options]
|
||||
# Legacy format:
|
||||
# root=/dev/nfs nfsroot=[server:]path[,options]
|
||||
#
|
||||
# FIXME: This blurb below refers to only legacy?
|
||||
# If the 'nfsroot' parameter is not given on the command line or is empty,
|
||||
# the dhcp root-path is used as [server:]path[:options] or the default
|
||||
# "/tftpboot/%s" will be used.
|
||||
|
|
@ -79,7 +80,7 @@ esac
|
|||
|
||||
# Root takes precedence over netroot
|
||||
case "${root%%:*}" in
|
||||
nfs|nfs4|/dev/nfs|/dev/nfs4)
|
||||
nfs|nfs4|/dev/nfs)
|
||||
if [ -n "$netroot" ] ; then
|
||||
warn "root takes precedence over netroot. Ignoring netroot"
|
||||
|
||||
|
|
@ -90,7 +91,7 @@ esac
|
|||
|
||||
# If it's not empty or nfs we don't continue
|
||||
case "${netroot%%:*}" in
|
||||
''|nfs|nfs4|/dev/nfs|/dev/nfs4);;
|
||||
''|nfs|nfs4|/dev/nfs);;
|
||||
*) return;;
|
||||
esac
|
||||
|
||||
|
|
@ -101,14 +102,14 @@ if [ -n "$nfsroot" ] ; then
|
|||
warn "Argument nfsroot is deprecated and might be removed in a future release. See http://apps.sourceforge.net/trac/dracut/wiki/commandline for more information."
|
||||
|
||||
case "$netroot" in
|
||||
''|nfs|nfs4|/dev/nfs|/dev/nfs4) netroot=${netroot:-nfs}:$nfsroot;;
|
||||
*) die "Argument nfsroot only accepted for empty root= or root=[/dev/]nfs[4]"
|
||||
/dev/nfs) netroot=${netroot:-nfs}:$nfsroot;;
|
||||
*) die "Argument nfsroot only accepted for legacy root=/dev/nfs"
|
||||
esac
|
||||
fi
|
||||
|
||||
# If it's not nfs we don't continue
|
||||
case "${netroot%%:*}" in
|
||||
nfs|nfs4|/dev/nfs|/dev/nfs4);;
|
||||
nfs|nfs4|/dev/nfs);;
|
||||
*) return;;
|
||||
esac
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue