picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1907 from evverx/fix-pam-install-on-debian

Browse source 
tests: fix pam_modules installation on Debian (and Debian-like systems)
This commit is contained in:
Lennart Poettering 2015-11-16 12:33:09 +01:00
parent 9b65fd9fa9 bf3a947cb4
commit ab32771aa0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/test-functions
View file

@ -4,6 +4,7 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin
export PATH export PATH
LOOKS_LIKE_DEBIAN=$(source /etc/os-release && [[ "$ID" = "debian" || "$ID_LIKE" = "debian" ]] && echo yes)
KERNEL_VER=${KERNEL_VER-$(uname -r)} KERNEL_VER=${KERNEL_VER-$(uname -r)}
KERNEL_MODS="/lib/modules/$KERNEL_VER/" KERNEL_MODS="/lib/modules/$KERNEL_VER/"
@ -225,6 +226,7 @@ install_config_files() {
inst /etc/sysconfig/init inst /etc/sysconfig/init
inst /etc/passwd inst /etc/passwd
inst /etc/shadow inst /etc/shadow
inst /etc/login.defs
inst /etc/group inst /etc/group
inst /etc/shells inst /etc/shells
inst /etc/nsswitch.conf inst /etc/nsswitch.conf
@ -272,12 +274,14 @@ install_dbus() {
} }
install_pam() { install_pam() {
(
[[ "$LOOKS_LIKE_DEBIAN" ]] && type -p dpkg-architecture &>/dev/null && find "/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/security" -xtype f
find \ find \
/etc/pam.d \ /etc/pam.d \
/etc/security \ /etc/security \
/lib64/security \ /lib64/security \
/lib/security -xtype f \ /lib/security -xtype f \
| while read file; do ) | while read file; do
inst $file inst $file
done done
} }