diff options
| author | root | 2014-07-17 15:11:20 +0200 |
|---|---|---|
| committer | root | 2014-07-17 15:11:20 +0200 |
| commit | 9c547a5e5b50813f9441a96f3f8a7bd62d90f0e9 (patch) | |
| tree | 06abde51e32806f2bd157a1d2d07d0d15820326b /remote/modules/systemd/module.build | |
| parent | [idleaction] Restart cron daemon after creating new crontab (diff) | |
| download | tm-scripts-9c547a5e5b50813f9441a96f3f8a7bd62d90f0e9.tar.gz tm-scripts-9c547a5e5b50813f9441a96f3f8a7bd62d90f0e9.tar.xz tm-scripts-9c547a5e5b50813f9441a96f3f8a7bd62d90f0e9.zip | |
[pam] reworked how we determine path to PAM-modules
detect the path in remote/helper/paths.inc and use that global path in the build scripts
Diffstat (limited to 'remote/modules/systemd/module.build')
| -rw-r--r-- | remote/modules/systemd/module.build | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build index 4851f682..6e1cf4c1 100644 --- a/remote/modules/systemd/module.build +++ b/remote/modules/systemd/module.build @@ -59,11 +59,28 @@ build () { export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/lib64/pkgconfig:${MODULE_BUILD_DIR}/usr/lib/pkgconfig" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${MODULE_BUILD_DIR}/usr/lib:${MODULE_BUILD_DIR}/usr/lib64" - ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \ - --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \ - --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam \ - --enable-kmod \ + ./configure \ + --disable-manpages \ + --enable-split-usr \ + --sysconfdir="/etc" \ + --enable-gtk-doc-html=no \ + --disable-nls \ + --disable-microhttpd \ + --disable-bootchart \ + --disable-quotacheck \ + --disable-hostnamed \ + --disable-timedated \ + --disable-localed \ + --disable-coredump \ + --disable-keymap \ + --without-python \ + --enable-blkid \ + --enable-acl \ + --enable-pam \ + --enable-kmod \ + --with-pamlibdir="$SYS_PAM_MODULES_PATH" \ || perror "configure failed." + pinfo "calling make" make || perror "make failed." pinfo "calling make install" @@ -82,12 +99,5 @@ post_copy() { if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ]; then sed -i "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service" fi - - # 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 } |