Refactoring auth-fw.service and auth-fw-OOO.socket

 - "@SERVICE_NAME@.target" is a typo mistaken for "@SERVICE_NAME@.service".
 - All four sockets are required for auth-fw.service. So, "Requires=OOO.socket" must be in auth-fw.service.
 - "Sockets=" in the auth-fw.service is replaced by "Requires=OOO.socket".

Change-Id: I477d2788012e79240c6252045ad003a0df25ec4c
Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/packaging/auth-fw.spec b/packaging/auth-fw.spec
index 47037f176315655a887f9f3a8bf0fe01e9ef8f86..6e02cf1789e1bad4e572c52d1e46e55db95450d4 100644 (file)
--- a/packaging/auth-fw.spec
+++ b/packaging/auth-fw.spec
@@ -148,7 +148,6 @@ fi
 %license LICENSE
 %{bin_dir}/%{name}
 %{_libdir}/lib%{name}-commons.so.*
-%{_unitdir}/%{name}.target
 %{_unitdir}/%{name}.service
 %{_unitdir}/multi-user.target.wants/%{name}.service
 %{_unitdir}/%{sock_passwd_check}

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 77beffb14fbea0160c7abc2fc9ea4477f23044b4..2e5a92d441a3624db01dfcab03006eca1d6c6511 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -6,7 +6,6 @@ CONFIGURE_FILE(${SOCK_PASSWD_POLICY}.in ${SOCK_PASSWD_POLICY} @ONLY)
 
 INSTALL(FILES
     ${SERVICE_NAME}.service
-    ${SERVICE_NAME}.target
     ${SOCK_PASSWD_CHECK}
     ${SOCK_PASSWD_SET}
     ${SOCK_PASSWD_RESET}

diff --git a/systemd/auth-fw-passwd-check.socket.in b/systemd/auth-fw-passwd-check.socket.in
index a0702fccd2906776831f27460c35a70b9aa5945e..438c09b5686f1d303a690c7cb3862b54751185a9 100644 (file)
--- a/systemd/auth-fw-passwd-check.socket.in
+++ b/systemd/auth-fw-passwd-check.socket.in
@@ -5,12 +5,7 @@ SocketGroup=security_fw
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@
-
 Service=@SERVICE_NAME@.service
 
-[Unit]
-Wants=@SERVICE_NAME@.target
-Before=@SERVICE_NAME@.target
-
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/auth-fw-passwd-policy.socket.in b/systemd/auth-fw-passwd-policy.socket.in
index aa179ffcf99e34eb663b77b6ae99905aec40e127..e3be43af428197bdf4e506cd93395ae3ff735085 100644 (file)
--- a/systemd/auth-fw-passwd-policy.socket.in
+++ b/systemd/auth-fw-passwd-policy.socket.in
@@ -5,12 +5,7 @@ SocketGroup=security_fw
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@
-
 Service=@SERVICE_NAME@.service
 
-[Unit]
-Wants=@SERVICE_NAME@.target
-Before=@SERVICE_NAME@.target
-
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/auth-fw-passwd-reset.socket.in b/systemd/auth-fw-passwd-reset.socket.in
index e486a285232c0cab7426a4dee972ff4643836619..ae6845dac2d1391d812acfdbf02d6883969938dc 100644 (file)
--- a/systemd/auth-fw-passwd-reset.socket.in
+++ b/systemd/auth-fw-passwd-reset.socket.in
@@ -5,12 +5,7 @@ SocketGroup=security_fw
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@
-
 Service=@SERVICE_NAME@.service
 
-[Unit]
-Wants=@SERVICE_NAME@.target
-Before=@SERVICE_NAME@.target
-
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/auth-fw-passwd-set.socket.in b/systemd/auth-fw-passwd-set.socket.in
index ed28dd109233ccff11f88dda7ca3fd04d59e991e..8dd05fccd8a749229d6a9a6516aeb6a490f1b1da 100644 (file)
--- a/systemd/auth-fw-passwd-set.socket.in
+++ b/systemd/auth-fw-passwd-set.socket.in
@@ -5,12 +5,7 @@ SocketGroup=security_fw
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@
-
 Service=@SERVICE_NAME@.service
 
-[Unit]
-Wants=@SERVICE_NAME@.target
-Before=@SERVICE_NAME@.target
-
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/auth-fw.service.in b/systemd/auth-fw.service.in
index 928c332ae1e34c0bc3bbced62823b745c78d2588..9d6f7477c29e1a3b496d7ba647125f3238496c06 100644 (file)
--- a/systemd/auth-fw.service.in
+++ b/systemd/auth-fw.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Start @SERVICE_NAME@ server
+Requires=@SOCK_PASSWD_CHECK@ @SOCK_PASSWD_SET@ @SOCK_PASSWD_RESET@ @SOCK_PASSWD_POLICY@
 
 [Service]
 Type=notify
@@ -7,10 +8,6 @@ ExecStart=@BIN_DIR@/@SERVICE_NAME@
 User=security_fw
 Group=security_fw
 SmackProcessLabel=System
-Sockets=@SOCK_PASSWD_CHECK@
-Sockets=@SOCK_PASSWD_SET@
-Sockets=@SOCK_PASSWD_RESET@
-Sockets=@SOCK_PASSWD_POLICY@
 
 [Install]
 WantedBy=multi-user.target

diff --git a/systemd/auth-fw.target b/systemd/auth-fw.target
deleted file mode 100644 (file)
index 683b5cb..0000000
--- a/systemd/auth-fw.target
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-Description=authentication server sockets