From 15202934cd4aceb7d8b0d8d60659026820132ef2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Jul 2013 18:55:47 +0200
Subject: [nscd] Move nscd related files from pam module to nscd module

---
 .../data/etc/systemd/system/basic.target.wants/nscd.service   |  1 +
 remote/modules/nscd/data/etc/systemd/system/nscd.service      | 11 +++++++++++
 .../etc/systemd/system/multi-user.target.wants/nscd.service   |  1 -
 remote/modules/pam/data/etc/systemd/system/nscd.service       | 11 -----------
 remote/modules/pam/pam.build                                  |  3 ++-
 5 files changed, 14 insertions(+), 13 deletions(-)
 create mode 120000 remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service
 create mode 100644 remote/modules/nscd/data/etc/systemd/system/nscd.service
 delete mode 120000 remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service
 delete mode 100644 remote/modules/pam/data/etc/systemd/system/nscd.service

(limited to 'remote/modules')

diff --git a/remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service b/remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service
new file mode 120000
index 00000000..70066631
--- /dev/null
+++ b/remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service
@@ -0,0 +1 @@
+../nscd.service
\ No newline at end of file
diff --git a/remote/modules/nscd/data/etc/systemd/system/nscd.service b/remote/modules/nscd/data/etc/systemd/system/nscd.service
new file mode 100644
index 00000000..262bb534
--- /dev/null
+++ b/remote/modules/nscd/data/etc/systemd/system/nscd.service
@@ -0,0 +1,11 @@
+[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/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}"
 }
 
-- 
cgit v1.2.3-55-g7522