From f11f3ffa22a3d2f87860b9a7fc34cc826d676342 Mon Sep 17 00:00:00 2001 From: Bartlomiej Grzelewski Date: Mon, 16 Dec 2013 15:15:24 +0100 Subject: [PATCH] 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 --- packaging/security-server.spec | 1 + systemd/CMakeLists.txt | 1 + systemd/security-server-app-permissions.socket | 4 ++++ systemd/security-server-app-privilege-by-name.socket | 4 ++++ systemd/security-server-cookie-check-tmp.socket | 4 ++++ systemd/security-server-cookie-check.socket | 4 ++++ systemd/security-server-cookie-get.socket | 4 ++++ systemd/security-server-data-share.socket | 4 ++++ systemd/security-server-get-gid.socket | 4 ++++ systemd/security-server-open-for.socket | 4 ++++ systemd/security-server-password-check.socket | 4 ++++ systemd/security-server-password-reset.socket | 4 ++++ systemd/security-server-password-set.socket | 4 ++++ systemd/security-server-privilege-by-pid.socket | 4 ++++ systemd/security-server.target | 4 ++++ 15 files changed, 54 insertions(+) create mode 100644 systemd/security-server.target diff --git a/packaging/security-server.spec b/packaging/security-server.spec index e7a71db..fb01fa1 100644 --- 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 9503b72..493ffe4 100644 --- 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 5faa4ec..814de37 100644 --- 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 1850f2d..b5a032f 100644 --- 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 803609b..ddc7317 100644 --- 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 dda1291..ecd953b 100644 --- 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 754361b..899501e 100644 --- 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 95ac056..4b1f540 100644 --- 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 9a3ce8b..0b06c46 100644 --- 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 9e2c07b..1c41f2d 100644 --- 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 60274be..057746c 100644 --- 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 7e1dc5f..2ce101d 100644 --- 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 0e97a6f..19e677a 100644 --- 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 e805c3f..8de4cbb 100644 --- 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 index 0000000..9885544 --- /dev/null +++ b/systemd/security-server.target @@ -0,0 +1,4 @@ +[Unit] +Description=security-server sockets +DefaultDependencies=true + -- 2.7.4