test: rpc.idmapd is optional for NFS

See dracut NFS module (95nfs/module-setup.sh).

diff --git a/test/TEST-20-NFS/server-init.sh b/test/TEST-20-NFS/server-init.sh
index 3ddb733340a3c0749fe89354ac2a72a68e588fab..743f1d3e77f14af00314515c875ff7c78ab9649e 100755 (executable)
--- a/test/TEST-20-NFS/server-init.sh
+++ b/test/TEST-20-NFS/server-init.sh
@@ -88,7 +88,7 @@ rpc.nfsd
 : > /dev/watchdog
 rpc.mountd
 : > /dev/watchdog
-rpc.idmapd
+command -v rpc.idmapd > /dev/null && [ -z "$(pidof rpc.idmapd)" ] && rpc.idmapd
 : > /dev/watchdog
 exportfs -r
 : > /dev/watchdog

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 1ecf7f63008572b18fb636132b4a8b30cda8cbd7..855c5b3340b8a163e6b61e8fcf3ab3d55238b31f 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -273,7 +273,7 @@ test_setup() {
         inst ./dhcpd.conf /etc/dhcpd.conf
         inst_multiple -o {,/usr}/etc/nsswitch.conf {,/usr}/etc/rpc \
             {,/usr}/etc/protocols {,/usr}/etc/services
-        inst_multiple rpc.idmapd /etc/idmapd.conf
+        inst_multiple -o rpc.idmapd /etc/idmapd.conf
 
         inst_libdir_file 'libnfsidmap_nsswitch.so*'
         inst_libdir_file 'libnfsidmap/*.so*'

diff --git a/test/TEST-50-MULTINIC/server-init.sh b/test/TEST-50-MULTINIC/server-init.sh
index 0808d8d76a4487fa788dae542c860b9eb313cf52..7dcb256622b87694affafc1b35cf78998deb0840 100755 (executable)
--- a/test/TEST-50-MULTINIC/server-init.sh
+++ b/test/TEST-50-MULTINIC/server-init.sh
@@ -77,7 +77,7 @@ rpc.nfsd
 : > /dev/watchdog
 rpc.mountd
 : > /dev/watchdog
-rpc.idmapd
+command -v rpc.idmapd > /dev/null && [ -z "$(pidof rpc.idmapd)" ] && rpc.idmapd
 : > /dev/watchdog
 exportfs -r
 : > /dev/watchdog

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index 3dc8a812ab32eeab62f2cb7e2ecae73d90c95142..46895e72cae179f6e5aa1aafae5dca35e2735990 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -218,7 +218,7 @@ test_setup() {
         inst ./dhcpd.conf /etc/dhcpd.conf
         inst_multiple -o {,/usr}/etc/nsswitch.conf {,/usr}/etc/rpc \
             {,/usr}/etc/protocols {,/usr}/etc/services
-        inst_multiple rpc.idmapd /etc/idmapd.conf
+        inst_multiple -o rpc.idmapd /etc/idmapd.conf
 
         inst_libdir_file 'libnfsidmap_nsswitch.so*'
         inst_libdir_file 'libnfsidmap/*.so*'

diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/server-init.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/server-init.sh
index 5e7e56ef6739b9426f183ecaa64974f86b146b50..ea06b787e0a29f8108ffdb7576196d37e3787ad3 100755 (executable)
--- a/test/TEST-60-BONDBRIDGEVLANIFCFG/server-init.sh
+++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/server-init.sh
@@ -109,7 +109,7 @@ rpc.nfsd
 : > /dev/watchdog
 rpc.mountd
 : > /dev/watchdog
-rpc.idmapd -S
+command -v rpc.idmapd > /dev/null && [ -z "$(pidof rpc.idmapd)" ] && rpc.idmapd -S
 : > /dev/watchdog
 exportfs -r
 : > /dev/watchdog

diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
index d61604e569b2d4bec8d86c3956b0aa76db85b825..12afca94f6afdbf12eb6c31e4e3f6eb16ee79e76 100755 (executable)
--- a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
+++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
@@ -252,7 +252,7 @@ test_setup() {
         inst ./dhcpd.conf /etc/dhcpd.conf
         inst_multiple -o {,/usr}/etc/nsswitch.conf {,/usr}/etc/rpc {,/usr}/etc/protocols
 
-        inst_multiple rpc.idmapd /etc/idmapd.conf
+        inst_multiple -o rpc.idmapd /etc/idmapd.conf
 
         inst_libdir_file 'libnfsidmap_nsswitch.so*'
         inst_libdir_file 'libnfsidmap/*.so*'
@@ -300,7 +300,7 @@ test_setup() {
         inst /etc/passwd /etc/passwd
         inst /etc/group /etc/group
 
-        inst_multiple rpc.idmapd /etc/idmapd.conf
+        inst_multiple -o rpc.idmapd /etc/idmapd.conf
         inst_libdir_file 'libnfsidmap_nsswitch.so*'
         inst_libdir_file 'libnfsidmap/*.so*'
         inst_libdir_file 'libnfsidmap*.so*'