summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2019-07-18 01:24:00 +0200
committerMichael Biebl <biebl@debian.org>2019-07-18 12:46:35 +0200
commit6db904625d413739c480ddbe7667d3f40acc4ae0 (patch)
tree36462ca0acf0bf85407d860c55e49b032a5495a7 /src/test
parentea582a0f1b052330a45b5d7bbc9fb860d1c0d98b (diff)
downloadsystemd-6db904625d413739c480ddbe7667d3f40acc4ae0.tar.gz
systemd-6db904625d413739c480ddbe7667d3f40acc4ae0.tar.bz2
systemd-6db904625d413739c480ddbe7667d3f40acc4ae0.zip
meson: make nologin path build time configurable
Some distros install nologin as /usr/sbin/nologin, others as /sbin/nologin. Since we can't really on merged-usr everywhere (where the path wouldn't matter), make the path build time configurable via -Dnologin-path=. Closes #13028
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-user-util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c
index fd7878fde2..e6d7262e78 100644
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -219,8 +219,8 @@ int main(int argc, char *argv[]) {
test_get_user_creds_one("root", "root", 0, 0, "/root", "/bin/sh");
test_get_user_creds_one("0", "root", 0, 0, "/root", "/bin/sh");
- test_get_user_creds_one(NOBODY_USER_NAME, NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", "/sbin/nologin");
- test_get_user_creds_one("65534", NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", "/sbin/nologin");
+ test_get_user_creds_one(NOBODY_USER_NAME, NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", NOLOGIN);
+ test_get_user_creds_one("65534", NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", NOLOGIN);
test_get_group_creds_one("root", "root", 0);
test_get_group_creds_one("0", "root", 0);