diff options
| author | Bartlomiej Grzelewski <b.grzelewski@samsung.com> | 2013-12-16 15:15:24 +0100 |
|---|---|---|
| committer | Bartlomiej Grzelewski <b.grzelewski@samsung.com> | 2014-02-06 17:13:25 +0100 |
| commit | f11f3ffa22a3d2f87860b9a7fc34cc826d676342 (patch) | |
| tree | 35b2e5a0b9ba5035d84d1763199a9faedc483a4e /systemd | |
| parent | b56814a7846a2b698c84fc7de38ccae1d151b8db (diff) | |
| download | security-manager-f11f3ffa22a3d2f87860b9a7fc34cc826d676342.tar.gz security-manager-f11f3ffa22a3d2f87860b9a7fc34cc826d676342.tar.bz2 security-manager-f11f3ffa22a3d2f87860b9a7fc34cc826d676342.zip | |
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
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | systemd/security-server-app-permissions.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-app-privilege-by-name.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-cookie-check-tmp.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-cookie-check.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-cookie-get.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-data-share.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-get-gid.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-open-for.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-password-check.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-password-reset.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-password-set.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server-privilege-by-pid.socket | 4 | ||||
| -rw-r--r-- | systemd/security-server.target | 4 |
14 files changed, 53 insertions, 0 deletions
diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index 9503b729..493ffe44 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 5faa4ecc..814de37b 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 1850f2dd..b5a032f1 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 803609bf..ddc73179 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 dda12919..ecd953b4 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 754361ba..899501eb 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 95ac0568..4b1f5400 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 9a3ce8b7..0b06c46a 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 9e2c07b9..1c41f2df 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 60274beb..057746c3 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 7e1dc5ff..2ce101d3 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 0e97a6f8..19e677a5 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 e805c3fc..8de4cbbd 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 00000000..98855443 --- /dev/null +++ b/systemd/security-server.target @@ -0,0 +1,4 @@ +[Unit] +Description=security-server sockets +DefaultDependencies=true + |