[PATCH] common/rc: improve checks for YP/NIS

[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]



At the 2018 spring NFS BAT, we have a number of systems that return a valid
string from `domainaname`, but don't have the ypcat binary.  If we don't have
the yp-tools package installed, we're not going to be able to use ypcat, so
check for it and bail out.

Signed-off-by: Benjamin Coddington <bcodding@xxxxxxxxxx>
---
 common/rc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index 931767498f62..1b52fb3609c1 100644
--- a/common/rc
+++ b/common/rc
@@ -2023,7 +2023,8 @@ _yp_active()
 {
 	local dn
 	dn=$(domainname 2>/dev/null)
-	test -n "${dn}" -a "${dn}" != "(none)" -a "${dn}" != "localdomain"
+	ypcat=$(type -P ypcat)
+	test -n "${dn}" -a "${dn}" != "(none)" -a "${dn}" != "localdomain" -a -n "${ypcat}"
 	echo $?
 }
 
-- 
2.9.3

--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Filesystems Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux