Add security-server.target unit.

Service key-storage requires security-server but it should not use
security-server.socket in Requires field because it's part of private
implementation. This commit creates synchronization point
security-server.target that should be used by other services to add
requirement to security-server.

[Issue#]     N/A
[Bug/Cause]  N/A
[Problem]    key-storage is not able to start because new
             security-server does not create security-server.socket.
[Solution]   create synchronization point for key-storage

[Verification] Build, install, reboot device.

Change-Id: Id54e9187edf671eec047787bdeb27a8c2acca29e

diff --git a/packaging/security-server.spec b/packaging/security-server.spec
index e7a71db53b68fc478aa7f788467d1bd04bf9ff24..fb01fa1bdb29e7414befecdd5961a3f74f76602f 100644 (file)
--- a/packaging/security-server.spec
+++ b/packaging/security-server.spec
@@ -136,6 +136,7 @@ fi
 %{_libdir}/libsecurity-server-commons.so.*
 %attr(-,root,root) /usr/lib/systemd/system/multi-user.target.wants/security-server.service
 %attr(-,root,root) /usr/lib/systemd/system/security-server.service
+%attr(-,root,root) /usr/lib/systemd/system/security-server.target
 %attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-data-share.socket
 %attr(-,root,root) /usr/lib/systemd/system/security-server-data-share.socket
 %attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-get-gid.socket

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 9503b7291c6da4c86b970cadbbd340db8d662d38..493ffe44b124595c0de45b58d328e6c8f3652755 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,5 +1,6 @@
 INSTALL(FILES
     ${CMAKE_SOURCE_DIR}/systemd/security-server.service
+    ${CMAKE_SOURCE_DIR}/systemd/security-server.target
     ${CMAKE_SOURCE_DIR}/systemd/security-server-data-share.socket
     ${CMAKE_SOURCE_DIR}/systemd/security-server-get-gid.socket
     ${CMAKE_SOURCE_DIR}/systemd/security-server-privilege-by-pid.socket

diff --git a/systemd/security-server-app-permissions.socket b/systemd/security-server-app-permissions.socket
index 5faa4ecc5b09fd13c0693d601d48cc71243a47f8..814de37bda645e1f9001b8c9d9f1a9e0defb0f54 100644 (file)
--- a/systemd/security-server-app-permissions.socket
+++ b/systemd/security-server-app-permissions.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-app-privilege-by-name.socket b/systemd/security-server-app-privilege-by-name.socket
index 1850f2dd4ceda6013ad02bce29f5404de3f8e876..b5a032f12226a490bde1d333447bddf75975d481 100644 (file)
--- a/systemd/security-server-app-privilege-by-name.socket
+++ b/systemd/security-server-app-privilege-by-name.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-cookie-check-tmp.socket b/systemd/security-server-cookie-check-tmp.socket
index 803609bf46510f221ac051eef056c426e2ce3744..ddc73179716166360bedc1bd71570ca0f241dd2a 100644 (file)
--- a/systemd/security-server-cookie-check-tmp.socket
+++ b/systemd/security-server-cookie-check-tmp.socket
@@ -8,5 +8,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-cookie-check.socket b/systemd/security-server-cookie-check.socket
index dda129194b7c025bf652f3866bcda16849b3dff5..ecd953b44c6fa98317165c9b7a49699f19dfc2d5 100644 (file)
--- a/systemd/security-server-cookie-check.socket
+++ b/systemd/security-server-cookie-check.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-cookie-get.socket b/systemd/security-server-cookie-get.socket
index 754361ba4053378b0d99c85edbf15650b5ea5591..899501ebb9d53dd8353db85157ead002f6fdcc40 100644 (file)
--- a/systemd/security-server-cookie-get.socket
+++ b/systemd/security-server-cookie-get.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-data-share.socket b/systemd/security-server-data-share.socket
index 95ac0568ea9712b3e0f5b55db23fb321ffed589e..4b1f540070c3aa934e684623a1644485ff136c17 100644 (file)
--- a/systemd/security-server-data-share.socket
+++ b/systemd/security-server-data-share.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-get-gid.socket b/systemd/security-server-get-gid.socket
index 9a3ce8b71b73c819689b192bd9507aa45d5ef234..0b06c46abbf2bee24ca07200867015d2fff7d506 100644 (file)
--- a/systemd/security-server-get-gid.socket
+++ b/systemd/security-server-get-gid.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-open-for.socket b/systemd/security-server-open-for.socket
index 9e2c07b9fb13d0ef6655266056be5c2837804b5f..1c41f2df61bae801dff742ecf1ab1120103efb5b 100644 (file)
--- a/systemd/security-server-open-for.socket
+++ b/systemd/security-server-open-for.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-password-check.socket b/systemd/security-server-password-check.socket
index 60274bebfe0735afe8add127233ff40068abcf43..057746c34eeb6da8fe089580f71a91a476d92ccf 100644 (file)
--- a/systemd/security-server-password-check.socket
+++ b/systemd/security-server-password-check.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-password-reset.socket b/systemd/security-server-password-reset.socket
index 7e1dc5ff7ccf4b4394e17bb42ef89baebe141b9f..2ce101d3c6a6289786496b3d46ac74ee3cd7ec22 100644 (file)
--- a/systemd/security-server-password-reset.socket
+++ b/systemd/security-server-password-reset.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-password-set.socket b/systemd/security-server-password-set.socket
index 0e97a6f88f9cb95629f98805ba0935560fb4dbe8..19e677a59ed48f04f3be979017045ccca8062109 100644 (file)
--- a/systemd/security-server-password-set.socket
+++ b/systemd/security-server-password-set.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/security-server-privilege-by-pid.socket b/systemd/security-server-privilege-by-pid.socket
index e805c3fc74a5d30998ef8f5e5fd92372adfea45d..8de4cbbd1812a8520571151c144bc3a15142796e 100644 (file)
--- a/systemd/security-server-privilege-by-pid.socket
+++ b/systemd/security-server-privilege-by-pid.socket
@@ -6,5 +6,9 @@ SmackLabelIPOut=@
 
 Service=security-server.service
 
+[Unit]
+Wants=security-server.target
+Before=security-server.target
+
 [Install]
 WantedBy=sockets.target

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