summaryrefslogtreecommitdiff
path: root/test/TEST-20-NFS
diff options
context:
space:
mode:
authorDavid Dillow <dave@thedillows.org>2009-06-06 01:22:54 -0400
committerDavid Dillow <dave@thedillows.org>2009-06-06 01:22:54 -0400
commit35b709957fc915f3e34753ef143989f9c9fbe9c9 (patch)
tree3a12ec56cc7ae6a8434ed308b516b7a5e0a42529 /test/TEST-20-NFS
parentd462f6dc65255931a2ba2b432568ec962f783f50 (diff)
downloaddracut-35b709957fc915f3e34753ef143989f9c9fbe9c9.tar.gz
dracut-35b709957fc915f3e34753ef143989f9c9fbe9c9.tar.bz2
dracut-35b709957fc915f3e34753ef143989f9c9fbe9c9.zip
NFS test: rearrange the server tree so we can differentiate NFSv3 vs NFSv4
Diffstat (limited to 'test/TEST-20-NFS')
-rw-r--r--test/TEST-20-NFS/dhcpd.conf2
-rw-r--r--test/TEST-20-NFS/exports5
-rwxr-xr-xtest/TEST-20-NFS/test.sh4
3 files changed, 5 insertions, 6 deletions
diff --git a/test/TEST-20-NFS/dhcpd.conf b/test/TEST-20-NFS/dhcpd.conf
index 7ee1cacf..79b6a7bc 100644
--- a/test/TEST-20-NFS/dhcpd.conf
+++ b/test/TEST-20-NFS/dhcpd.conf
@@ -13,7 +13,7 @@ subnet 192.168.50.0 netmask 255.255.255.0 {
group {
# NFSv3 root=dhcp or root={/dev/,}nfs, use server-id
- option root-path "/client";
+ option root-path "/nfs/client";
host nfs3-1 {
hardware ethernet 52:54:00:12:34:00;
diff --git a/test/TEST-20-NFS/exports b/test/TEST-20-NFS/exports
index 0ec4f0ca..27018771 100644
--- a/test/TEST-20-NFS/exports
+++ b/test/TEST-20-NFS/exports
@@ -1,3 +1,2 @@
-/ 192.168.50.0/24(ro,fsid=0,insecure,no_subtree_check,no_root_squash)
-/client 192.168.50.0/24(ro,insecure,no_subtree_check,no_root_squash)
-
+/nfs 192.168.50.0/24(ro,fsid=0,insecure,no_subtree_check,no_root_squash)
+/nfs/client 192.168.50.0/24(ro,insecure,no_subtree_check,no_root_squash)
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 580c4dfa..5ec23416 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -99,8 +99,8 @@ test_setup() {
)
# Make client root inside server root
- initdir=mnt/client
- mkdir $initdir
+ initdir=mnt/nfs/client
+ mkdir -p $initdir
(
. $basedir/dracut-functions