Mark nscd service as forking in systemd service file (BZ #16639)

Currently the nscd service is installed in systemd as a simple
service, which means that it is able to handle its own errors and does
not quit.  Since nscd does not fit that description, i.e. it can exit
on errors like, say, failing to parse nscd.conf, it should be declared
as forking instead.

diff --git a/ChangeLog b/ChangeLog
index 526617720f78866398328e423ecef3e39fb7e792..be60b95db1a4b7bc1bd318f850fcb20cf3c1cd57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-10  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+       [BZ #16639]
+       * nscd/nscd.service: Make service type forking.
+
 2014-03-03  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        * sysdeps/powerpc/power5+/fpu/s_modf.c (__modf): Fix to return correct

diff --git a/NEWS b/NEWS
index 35481c75c867d6d18c88af9577442d4369c676d6..64a05000b0b6813bb2d28eeb50e34c765b8859b5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.20
 * The following bugs are resolved with this release:
 
   15347, 15804, 15894, 16447, 16532, 16545, 16574, 16600, 16609, 16610,
-  16611, 16613, 16623, 16632, 16670, 16674.
+  16611, 16613, 16623, 16632, 16639, 16670, 16674.
 
 * The am33 port, which had not worked for several years, has been removed
   from ports.

diff --git a/nscd/nscd.service b/nscd/nscd.service
index 99c756399056ce8cbdfa17caafcc606a6c844cc8..b7428a3613064b4bc33b3ff77b2d8cd935878056 100644 (file)
--- a/nscd/nscd.service
+++ b/nscd/nscd.service
@@ -4,8 +4,8 @@
 Description=Name Service Cache Daemon
 
 [Service]
-Type=simple
-ExecStart=/usr/sbin/nscd --foreground
+Type=forking
+ExecStart=/usr/sbin/nscd
 ExecStop=/usr/sbin/nscd --shutdown
 ExecReload=/usr/sbin/nscd -i passwd
 ExecReload=/usr/sbin/nscd -i group