summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-16 12:33:09 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-16 12:33:09 +0100
commitab32771aa0c2c2ab70248e7e0a4be92fd73512ad (patch)
tree28ab1d14fe4ab625795e824ef5025a7331d9f9e7
parent9b65fd9fa94838933f509fb0eb85f1a837dbef93 (diff)
parentbf3a947cb44f31359bba313e0252cbcc0dc95b03 (diff)
Merge pull request #1907 from evverx/fix-pam-install-on-debian
tests: fix pam_modules installation on Debian (and Debian-like systems)
-rw-r--r--test/test-functions6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions
index 49f143ec1e..c4cf2921c8 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/"
@@ -225,6 +226,7 @@ install_config_files() {
inst /etc/sysconfig/init
inst /etc/passwd
inst /etc/shadow
+ inst /etc/login.defs
inst /etc/group
inst /etc/shells
inst /etc/nsswitch.conf
@@ -272,12 +274,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
}