summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2015-11-15 20:38:56 +0000
committerEvgeny Vereshchagin <evvers@ya.ru>2015-11-15 21:21:18 +0000
commit0fe15dc8ddddeb39a5cad1f4f4afa25fa074a5d1 (patch)
treea819f6d09fc92b2dd079a53658d246c85b06b651
parent7ad8eb8d84a53a1dc55411ae1087bd9a2f3b58bf (diff)
tests: fix pam_modules installation on Debian (and Debian-like systems)
libpam_modules installs modules into /lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/security on Debian Fixes: systemd-testsuite login[36]: PAM unable to dlopen(pam_group.so): /lib/security/pam_group.so: cannot open shared object file: No such file or directory systemd-testsuite login[36]: PAM adding faulty module: pam_group.so systemd-testsuite login[36]: PAM unable to dlopen(pam_limits.so): /lib/security/pam_limits.so: cannot open shared object file: No such file or directory systemd-testsuite login[36]: PAM adding faulty module: pam_limits.so ... etc
-rw-r--r--test/test-functions5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions
index 49f143ec1e..dcf50dd00c 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -4,6 +4,7 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
export PATH
+LOOKS_LIKE_DEBIAN=$(source /etc/os-release && [[ "$ID" = "debian" || "$ID_LIKE" = "debian" ]] && echo yes)
KERNEL_VER=${KERNEL_VER-$(uname -r)}
KERNEL_MODS="/lib/modules/$KERNEL_VER/"
@@ -272,12 +273,14 @@ install_dbus() {
}
install_pam() {
+ (
+ [[ "$LOOKS_LIKE_DEBIAN" ]] && type -p dpkg-architecture &>/dev/null && find "/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/security" -xtype f
find \
/etc/pam.d \
/etc/security \
/lib64/security \
/lib/security -xtype f \
- | while read file; do
+ ) | while read file; do
inst $file
done
}