diff options
| author | Jonathan Bauer | 2013-07-03 18:35:51 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-07-03 18:35:51 +0200 |
| commit | 5e80d6c87af2304a8e12adb0eded423149f9aa28 (patch) | |
| tree | 6735b2471b9762f1bcf04aa6a43e1eda22613fa7 /remote/modules/pam | |
| parent | [pam] add path to rfc_pipefs filesystem when executing rpc.gssd (needed to fi... (diff) | |
| parent | +LANG: de_DE.utf8 in /etc/profile (diff) | |
| download | tm-scripts-5e80d6c87af2304a8e12adb0eded423149f9aa28.tar.gz tm-scripts-5e80d6c87af2304a8e12adb0eded423149f9aa28.tar.xz tm-scripts-5e80d6c87af2304a8e12adb0eded423149f9aa28.zip | |
Merge branch 'master' of git:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/pam')
4 files changed, 5 insertions, 14 deletions
diff --git a/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service b/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service index a09b78ae..518681b6 100644 --- a/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service +++ b/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service @@ -2,5 +2,7 @@ Description=Activate NSS-LDAP lookups [Service] -Type=simple +Type=oneshot ExecStart=/opt/openslx/bin/sed -i -e 's/^passwd.*/passwd:\t\tfiles ldap/g;s/^group.*/group:\t\tfiles ldap/g' /etc/nsswitch.conf +ExecStart=/usr/bin/systemctl restart nscd + diff --git a/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service b/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service deleted file mode 120000 index 70066631..00000000 --- a/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service +++ /dev/null @@ -1 +0,0 @@ -../nscd.service
\ No newline at end of file diff --git a/remote/modules/pam/data/etc/systemd/system/nscd.service b/remote/modules/pam/data/etc/systemd/system/nscd.service deleted file mode 100644 index 262bb534..00000000 --- a/remote/modules/pam/data/etc/systemd/system/nscd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Name Service Cache Daemon - -[Service] -ExecStart=/usr/sbin/nscd -d -ExecStop=/usr/sbin/nscd --shutdown -Restart=always - -[Install] -WantedBy=multi-user.target -Also=nscd.socket diff --git a/remote/modules/pam/pam.build b/remote/modules/pam/pam.build index d3c0dd88..607139fa 100644 --- a/remote/modules/pam/pam.build +++ b/remote/modules/pam/pam.build @@ -6,7 +6,8 @@ build() { mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" gcc -o "$MODULE_BUILD_DIR/opt/openslx/bin/sslconnect" "$MODULE_DIR/sslconnect.c" -lssl -lcrypto -O3 || perror "Could not compile sslconnect.c" local COPYLIST="$MODULE_BUILD_DIR/list_packet_files" - list_packet_files | sort -u > "$COPYLIST" + # TODO: Hack for SUSE: Ignore file (/var/lib/nfs/state) that does not exist :( + list_packet_files | grep -v '/var/lib/nfs/state' | sort -u > "$COPYLIST" tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}" } |