NFS test: rearrange the server tree so we can differentiate NFSv3 vs NFSv4

diff --git a/test/TEST-20-NFS/dhcpd.conf b/test/TEST-20-NFS/dhcpd.conf
index 7ee1cacf4e6437fb06eef8ab40d893e117ad4de7..79b6a7bc5ed72fe8763e5c5d5a473f43d1524101 100644 (file)
--- 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 0ec4f0ca8cfdf7c1525bc575f40dfa6f8082d58d..27018771fbc7c316afbe47d1d6a3d47dd019ab3b 100644 (file)
--- 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 580c4dfa70d953b251dcc86085ad04963718d34f..5ec23416e772b0aafdb9048ce1bf2dc44247bef1 100755 (executable)
--- 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