diff mbox

common/rc: accept "localdomain" to mean YP/NIS disabled

Message ID 20170228220936.89655-1-ebiggers3@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eric Biggers Feb. 28, 2017, 10:09 p.m. UTC 
From: Eric Biggers <ebiggers@google.com>

When asked to 'cat' the passwd or group files, currently xfstests runs
the 'domainname' program to get what the kernel thinks the domainname
is.  It seems that traditionally this has been "(none)" if YP/NIS is not
in use.  However, Android devices use a different convention which is to
set the domainname to "localdomain".  Therefore, this patch updates
xfstests to accept both conventions to indicate YP/NIS disabled.  This
stops a number of tests from failing when run on Android.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/common/rc b/common/rc
index 8f233346..aa78d4b2 100644
--- a/common/rc
+++ b/common/rc
@@ -1792,7 +1792,7 @@  _yp_active()
 {
 	local dn
 	dn=$(domainname 2>/dev/null)
-	test -n "${dn}" -a "${dn}" != "(none)"
+	test -n "${dn}" -a "${dn}" != "(none)" -a "${dn}" != "localdomain"
 	echo $?
 }