Refactoring csr.service and csr-OOO.socket

 - Using "Wants=csr.service" in csr-OOO.socket is replaced by putting csr.service in multi-user.target.wants.
 - Using "After=csr.service" in csr-OOO.socket is not requires because there is an explicit dependency between socket and service.
 - All four sockets are required for csr.service. So, "Requires=OOO.socket" must be in csr.service.
 - "Sockets=" in the csr.service is replaced by "Requires=OOO.socket". ("Sockets=" includes "After=" and "Wants=")

Change-Id: If6303fcf17f16c70b4c5b67cca897f0c650b4b85

diff --git a/packaging/csr-framework.spec b/packaging/csr-framework.spec
index 3b69b24..439fed3 100644 (file)
--- a/packaging/csr-framework.spec
+++ b/packaging/csr-framework.spec
@@ -204,6 +204,7 @@ find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
 %install_service sockets.target.wants %{service_name}-cs.socket
 %install_service sockets.target.wants %{service_name}-wp.socket
 %install_service sockets.target.wants %{service_name}-admin.socket
+%install_service multi-user.target.wants %{service_name}.service
 %install_service ../user/sockets.target.wants %{service_name}-popup.socket
 %install_service ../system/user-sockets@.target.wants %{service_name}-popup@.socket
 
@@ -296,6 +297,7 @@ su - owner -c %{bin_dir}/%{service_name}-test
 %{bin_dir}/%{service_name}-server
 %{bin_dir}/%{service_name}-popup
 %{_unitdir}/%{service_name}.service
+%{_unitdir}/multi-user.target.wants/%{service_name}.service
 %{_unitdir}/sockets.target.wants/%{service_name}-cs.socket
 %{_unitdir}/sockets.target.wants/%{service_name}-wp.socket
 %{_unitdir}/sockets.target.wants/%{service_name}-admin.socket

diff --git a/systemd/csr-admin.socket.in b/systemd/csr-admin.socket.in
index 8d78425..a68c7c0 100644 (file)
--- a/systemd/csr-admin.socket.in
+++ b/systemd/csr-admin.socket.in
@@ -1,7 +1,5 @@
 [Unit]
 Description=Csr admin socket
-Wants=@SERVICE_NAME@.service
-Before=@SERVICE_NAME@.service
 
 [Socket]
 ListenStream=/tmp/.@SERVICE_NAME@-admin.socket

diff --git a/systemd/csr-cs.socket.in b/systemd/csr-cs.socket.in
index ee30304..802ee50 100644 (file)
--- a/systemd/csr-cs.socket.in
+++ b/systemd/csr-cs.socket.in
@@ -1,7 +1,5 @@
 [Unit]
 Description=Csr content screening socket
-Wants=@SERVICE_NAME@.service
-Before=@SERVICE_NAME@.service
 
 [Socket]
 ListenStream=/tmp/.@SERVICE_NAME@-cs.socket

diff --git a/systemd/csr-wp.socket.in b/systemd/csr-wp.socket.in
index 97665c3..eb8756d 100644 (file)
--- a/systemd/csr-wp.socket.in
+++ b/systemd/csr-wp.socket.in
@@ -1,7 +1,5 @@
 [Unit]
 Description=Csr web protection socket
-Wants=@SERVICE_NAME@.service
-Before=@SERVICE_NAME@.service
 
 [Socket]
 ListenStream=/tmp/.@SERVICE_NAME@-wp.socket

diff --git a/systemd/csr.service.in b/systemd/csr.service.in
index 7fbf21d..f1db438 100644 (file)
--- a/systemd/csr.service.in
+++ b/systemd/csr.service.in
@@ -9,6 +9,3 @@ SmackProcessLabel=@SMACK_DOMAIN_NAME@
 SecureBits=keep-caps
 Capabilities=cap_dac_override,cap_fowner=i
 ExecStart=@BIN_DIR@/@SERVICE_NAME@-server
-Sockets=@SERVICE_NAME@-cs.socket
-Sockets=@SERVICE_NAME@-wp.socket
-Sockets=@SERVICE_NAME@-admin.socket