Don't start the service on system boot, rely on socket activation

Security-manager doesn't need to be started immediately on system boot.
Systemd socket activation is already in place for lazy startup. Also previous
configuration wrongly started security-manager.target, which caused the
service to be launched without sockets passed from systemd.

Change-Id: I7bff7b58a4e016119e651edfefb85a2335b8b31f
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec
index b39e24a..7da352b 100644 (file)
--- a/packaging/security-manager.spec
+++ b/packaging/security-manager.spec
@@ -84,9 +84,7 @@ mkdir -p %{buildroot}/%{TZ_SYS_SMACK}
 cp app-rules-template.smack %{buildroot}/%{TZ_SYS_SMACK}
 %make_install
 
-mkdir -p %{buildroot}/%{_unitdir}/multi-user.target.wants
 mkdir -p %{buildroot}/%{_unitdir}/sockets.target.wants
-ln -s ../security-manager.service %{buildroot}/%{_unitdir}/multi-user.target.wants/security-manager.service
 ln -s ../security-manager.socket %{buildroot}/%{_unitdir}/sockets.target.wants/security-manager.socket
 
 %clean
@@ -136,11 +134,8 @@ fi
 %attr(755,root,root) %{_sysconfdir}/gumd/userdel.d/50_security-manager-remove.pre
 
 %{_libdir}/libsecurity-manager-commons.so.*
-%attr(-,root,root) %{_unitdir}/multi-user.target.wants/security-manager.service
-%attr(-,root,root) %{_unitdir}/security-manager.service
-%attr(-,root,root) %{_unitdir}/security-manager.target
-%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-manager.socket
-%attr(-,root,root) %{_unitdir}/security-manager.socket
+%attr(-,root,root) %{_unitdir}/security-manager.*
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-manager.*
 %attr(-,root,root) %{TZ_SYS_SMACK}/app-rules-template.smack
 %config(noreplace) %attr(0600,root,root) %{TZ_SYS_DB}/.security-manager.db
 %config(noreplace) %attr(0600,root,root) %{TZ_SYS_DB}/.security-manager.db-journal

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 66af5dd..90c0ec1 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -2,7 +2,6 @@ CONFIGURE_FILE(security-manager.service.in security-manager.service @ONLY)
 
 INSTALL(FILES
     security-manager.service
-    security-manager.target
     security-manager.socket
     DESTINATION
     ${SYSTEMD_INSTALL_DIR}

diff --git a/systemd/security-manager.service.in b/systemd/security-manager.service.in
index de58043..23fd1b2 100644 (file)
--- a/systemd/security-manager.service.in
+++ b/systemd/security-manager.service.in
@@ -4,8 +4,4 @@ Description=Start the security manager
 [Service]
 Type=notify
 ExecStart=@BIN_INSTALL_DIR@/security-manager
-
 Sockets=security-manager.socket
-
-[Install]
-WantedBy=multi-user.target

diff --git a/systemd/security-manager.target b/systemd/security-manager.target
deleted file mode 100644 (file)
index 8586718..0000000
--- a/systemd/security-manager.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=security-manager sockets
-DefaultDependencies=true
-