aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/system/afm-system-setup.service.in2
-rw-r--r--conf/system/afm-system-setup.sh.in2
-rw-r--r--conf/system/afm-user-setup.sh.in2
-rw-r--r--conf/unit/service.inc6
4 files changed, 6 insertions, 6 deletions
diff --git a/conf/system/afm-system-setup.service.in b/conf/system/afm-system-setup.service.in
index 4ffab9b..694ac2d 100644
--- a/conf/system/afm-system-setup.service.in
+++ b/conf/system/afm-system-setup.service.in
@@ -1,6 +1,6 @@
[Unit]
Description=Initiate afm-system-setup
-Before=weston@display.service afs-supervisor.service afm-system-daemon.service
+Before=weston.service afs-supervisor.service afm-system-daemon.service
[Service]
Type=oneshot
ExecStart=-@afm_libexecdir@/afm-system-setup.sh
diff --git a/conf/system/afm-system-setup.sh.in b/conf/system/afm-system-setup.sh.in
index ba4ff4c..d71ee4d 100644
--- a/conf/system/afm-system-setup.sh.in
+++ b/conf/system/afm-system-setup.sh.in
@@ -10,7 +10,7 @@ dodir() {
done
}
-dodir /run/user $pdir $pdir/display $pdir/apis $pdir/apis/ws $pdir/apis/link
+dodir /run/user $pdir $pdir/weston $pdir/apis $pdir/apis/ws $pdir/apis/link
@create_platform_debug@
diff --git a/conf/system/afm-user-setup.sh.in b/conf/system/afm-user-setup.sh.in
index 1b619a0..a3599e9 100644
--- a/conf/system/afm-user-setup.sh.in
+++ b/conf/system/afm-user-setup.sh.in
@@ -28,5 +28,5 @@ doln() {
fi
}
-doln @afm_platform_rundir@/display/wayland-0 $udir/wayland-0
+doln @afm_platform_rundir@/weston/wayland-0 $udir/wayland-0
diff --git a/conf/unit/service.inc b/conf/unit/service.inc
index dcc576b..d29774d 100644
--- a/conf/unit/service.inc
+++ b/conf/unit/service.inc
@@ -47,8 +47,8 @@ After=user@%i.service
ENDIF
IF_PERM(:public:display)
-BindsTo=weston@display.service
-After=weston@display.service
+BindsTo=weston.service
+After=weston.service
ENDIF
IF_PERM(:public:bluetooth)
@@ -118,7 +118,7 @@ ENDIF
ON_PERM(:platform:no-oom, OOMScoreAdjust=-500)
ON_PERM(:partner:real-time, IOSchedulingClass=realtime)
-ON_PERM(:public:display, SupplementaryGroups=display)
+ON_PERM(:public:display, SupplementaryGroups=weston)
ON_PERM(:public:audio, SupplementaryGroups=audio)
ON_NOT_PERM(:public:syscall:clock, SystemCallFilter=~@clock)
%nl