diff --git a/tests/p_autofs/0-install_autofs.sh b/tests/p_autofs/0-install_autofs.sh index 3ef8c7a..348649e 100755 --- a/tests/p_autofs/0-install_autofs.sh +++ b/tests/p_autofs/0-install_autofs.sh @@ -16,6 +16,9 @@ echo '/var/lib/ 127.0.0.1(ro)' >> /etc/exports if [ "$centos_ver" = "5" ] ; then t_ServiceControl portmap restart t_ServiceControl nfs restart +elif [ "$centos_ver" -ge 8 ] ; then + t_ServiceControl rpcbind restart + t_ServiceControl nfs-server restart else t_ServiceControl rpcbind restart t_ServiceControl nfs restart @@ -24,7 +27,7 @@ fi t_Log 'verify if NFS is mountable' mount -t nfs 127.0.0.1:/var/lib /mnt -ls -al /mnt | grep -q yum +ls -al /mnt | egrep -q '(dnf|yum)' t_CheckExitStatus $? umount /mnt diff --git a/tests/p_autofs/10-autofs-nfs-mount.sh b/tests/p_autofs/10-autofs-nfs-mount.sh index 440399d..939a37e 100755 --- a/tests/p_autofs/10-autofs-nfs-mount.sh +++ b/tests/p_autofs/10-autofs-nfs-mount.sh @@ -12,7 +12,7 @@ t_ServiceControl autofs restart t_Log 'Running test - accessing /var/lib via autofs' -ls -al /autofs/nfs | grep -q yum +ls -al /autofs/nfs | egrep -q '(dnf|yum)' t_CheckExitStatus $? # return everything to previous state @@ -21,4 +21,5 @@ rm -rf /etc/auto.autofs cat /dev/null > /etc/exports t_ServiceControl autofs stop t_ServiceControl nfs stop +t_ServiceControl nfs-server stop t_ServiceControl rpcbind stop