diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-03-01 18:18:58 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2021-03-01 18:22:07 -0500 |
| commit | f8cb98997734001dac0534110a5c0d97f71bc7a8 (patch) | |
| tree | fe195c1ed974c8bbf5da64701070dc66d71d15f6 | |
| parent | 3ea6f4a404d2486ef1c5da55f1cd0d98c594f157 (diff) | |
Update weston user/group
Change the user and group used to run weston or the agl-compositor
from "display" to "weston" and the weston service unit name to match
the reworked scheme for running weston as non-root in poky master.
This approach seems better in the long-term for maintenance and
avoiding surprises for users coming to AGL from other distributions.
Bug-AGL: SPEC-3819
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ia8093a6b14d6b5311f18633b6d0083bdd216fade
| -rw-r--r-- | conf/system/afm-system-setup.service.in | 2 | ||||
| -rw-r--r-- | conf/system/afm-system-setup.sh.in | 2 | ||||
| -rw-r--r-- | conf/system/afm-user-setup.sh.in | 2 | ||||
| -rw-r--r-- | conf/unit/service.inc | 6 |
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 |