Fix systemd service script

This commit fixes service load error after installation and
service reload after reinstallation.

Change-Id: I8d66540028cd3eb78f9db9fe08992a9070685edb
Signed-off-by: Jaroslaw Pelczar <j.pelczar@samsung.com>

diff --git a/packaging/device-certificate-manager.spec b/packaging/device-certificate-manager.spec
index b80bcca..c234ba7 100644 (file)
--- a/packaging/device-certificate-manager.spec
+++ b/packaging/device-certificate-manager.spec
@@ -75,17 +75,15 @@ make %{?jobs:-j%jobs}
 %install_service sockets.target.wants device-certificate-manager-control.socket
 
 %post
-
+/sbin/ldconfig
 systemctl daemon-reload
-if [ $1 = 1 ]; then
-    # installation
-    systemctl start device-certificate-manager.service
-fi
+systemctl restart device-certificate-manager.service
 
 %preun
 if [ $1 = 0 ]; then
     # unistall
     systemctl stop device-certificate-manager.service
+    systemctl stop device-certificate-manager-control.socket
 fi
 
 %postun

diff --git a/systemd/device-certificate-manager.service.in b/systemd/device-certificate-manager.service.in
index bce74b8..f36bc91 100644 (file)
--- a/systemd/device-certificate-manager.service.in
+++ b/systemd/device-certificate-manager.service.in
@@ -1,12 +1,14 @@
 [Unit]
 Description=Start the Device Certificate Manager
-DefaultDependencies=no
 
 [Service]
 User=@USER_NAME@
 Group=@GROUP_NAME@
 SmackProcessLabel=@SMACK_DOMAIN_NAME@
 Type=notify
+KillMode=process
+TimeoutStopSec=3
+Restart=always
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/device-certificate-managerd
 Sockets=device-certificate-manager-control.socket