summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorJonathan Bauer2013-06-11 16:17:08 +0200
committerJonathan Bauer2013-06-11 16:17:08 +0200
commitbf4e9463612ebff1a448220e21edd9b499625b10 (patch)
treeb13d8b9cc8f02afb425d6cec0d2743532ae1fffa /remote/modules
parentEnable le keymap german in stage32 (diff)
parent[systemd] fix pam_systemd.so copying (wrong path at build time, so need to co... (diff)
downloadtm-scripts-bf4e9463612ebff1a448220e21edd9b499625b10.tar.gz
tm-scripts-bf4e9463612ebff1a448220e21edd9b499625b10.tar.xz
tm-scripts-bf4e9463612ebff1a448220e21edd9b499625b10.zip
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/systemd/systemd.build7
-rw-r--r--remote/modules/systemd/systemd.conf1
2 files changed, 7 insertions, 1 deletions
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
"
-