Add network and bluetooth permissions to service template

Add new public:network and public:bluetooth permissions that currently
drive adding dependencies on network.target and bluetooth.target,
respectively.  This allows related bindings to depend on those to
avoid start up races.  In the future, these permissions could perhaps
be tied to configuring DBus access control of the related services.

Bug-AGL: SPEC-3509

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I582691bfe223a01ce80f04a4b0a1463d58287a9c
(cherry picked from commit 0a24bbdab25e792b5abe2f3708aceb5a9b3a5e42)

diff --git a/conf/unit/service.inc b/conf/unit/service.inc
index ea08220..dcc576b 100644 (file)
--- a/conf/unit/service.inc
+++ b/conf/unit/service.inc
@@ -46,13 +46,21 @@ Requires=afm-user-session@%i.target
 After=user@%i.service
 ENDIF
 
-After=Network.target
-
 IF_PERM(:public:display)
 BindsTo=weston@display.service
 After=weston@display.service
 ENDIF
 
+IF_PERM(:public:bluetooth)
+Wants=bluetooth.target
+After=bluetooth.target
+ENDIF
+
+IF_PERM(:public:network)
+Wants=network.target
+After=network.target
+ENDIF
+
 # Adds check to smack
 ConditionSecurity=smack
 %nl