diff options
| author | Simon Rettberg | 2013-06-11 18:17:25 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-11 18:17:25 +0200 |
| commit | 6f85f761a763b5d999768a8950c9e44f81e45c4f (patch) | |
| tree | 3a15d50402c72332d9da4a41fe4bd26a7a1ec3db /remote/modules | |
| parent | [xorg] Fix GLX on SUSE (intel only) (diff) | |
| parent | Merge branch 'master' of simonslx:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-6f85f761a763b5d999768a8950c9e44f81e45c4f.tar.gz tm-scripts-6f85f761a763b5d999768a8950c9e44f81e45c4f.tar.xz tm-scripts-6f85f761a763b5d999768a8950c9e44f81e45c4f.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/pam/data/etc/pam.d/common-session | 1 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.build | 7 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.conf | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/remote/modules/pam/data/etc/pam.d/common-session b/remote/modules/pam/data/etc/pam.d/common-session index 25311276..c5813892 100644 --- a/remote/modules/pam/data/etc/pam.d/common-session +++ b/remote/modules/pam/data/etc/pam.d/common-session @@ -29,4 +29,5 @@ session optional pam_umask.so session [success=1] pam_unix.so session [success=ok] pam_ldap.so session optional pam_mkhomedir.so skel=/etc/skel umask=0022 +session required pam_systemd.so kill-session-processes=1 # end of pam-auth-update config diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index a0a57b4d..112298e3 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -47,5 +47,12 @@ post_copy() { # add nfs to modules-load list echo "nfs" > "${TARGET_BUILD_DIR}/etc/modules-load.d/nfs.conf" + + # add pam_systemd.so to pam modules directory + if [ -e "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" ]; then + cp "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" "${TARGET_BUILD_DIR}/lib/security/" + else + pdebug "No such file: ${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" + fi } diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf index 19e4084e..1bf44782 100644 --- a/remote/modules/systemd/systemd.conf +++ b/remote/modules/systemd/systemd.conf @@ -107,4 +107,3 @@ REQUIRED_DIRECTORIES=" /usr/lib/systemd /usr/lib/tmpfiles.d " - |