summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElisei Roca <42994510+eliroca@users.noreply.github.com>2020-06-23 07:42:15 +0200
committerGitHub <noreply@github.com>2020-06-23 07:42:15 +0200
commit9e1732924d5b69647e8020c98796748d9b0ad926 (patch)
treea583e4312c76f3fb2a5bb60b6175432f81caff78
parentMerge pull request #16237 from keszybz/revert-message-type-check (diff)
downloadsystemd-9e1732924d5b69647e8020c98796748d9b0ad926.tar.xz
systemd-9e1732924d5b69647e8020c98796748d9b0ad926.zip
test-functions: read /usr/etc/nsswitch.conf if /etc/nsswitch.conf does not exist (#16195)
See this for more info why and since when this change is needed: https://build.opensuse.org/request/show/807179.
Diffstat (limited to '')
-rw-r--r--test/test-functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions
index df87261ea2..f7f604aec3 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -935,7 +935,7 @@ install_config_files() {
inst /etc/login.defs
inst /etc/group
inst /etc/shells
- inst /etc/nsswitch.conf
+ inst_any /etc/nsswitch.conf /usr/etc/nsswitch.conf
inst /etc/pam.conf || :
inst /etc/os-release
inst /etc/localtime