diff options
| author | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-09-29 18:14:21 +0200 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-10-21 15:46:52 +0200 |
| commit | bbd7785dfe9da381b862a86ddb13a6a3d7cb71fd (patch) | |
| tree | 5830b48e2790125a8c87b1ed065ad0224c51c2ce | |
| parent | ace16a8ec59ded02a48edf17a67609d11e5df154 (diff) | |
| download | weston-common-bbd7785dfe9da381b862a86ddb13a6a3d7cb71fd.tar.gz weston-common-bbd7785dfe9da381b862a86ddb13a6a3d7cb71fd.tar.bz2 weston-common-bbd7785dfe9da381b862a86ddb13a6a3d7cb71fd.zip | |
Fix weston startup with systemd 212
- %h placeholder *MUST NOT* be used in systemd(system) service files, starting from upstream commit 2cfbd749
- SMACK="<label>" *MUST* be changed to SECLABEL{smack}="<label>" in /etc/udev/rules.d/*
Change-Id: I8f59f73f6d7b4ee6fa4faa7d6978135de326a327
Bug-Tizen: TC-660
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
| -rw-r--r-- | display-manager-run.service | 3 | ||||
| -rw-r--r-- | packaging/weston-common.spec | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/display-manager-run.service b/display-manager-run.service index a653ce3..9d9fdde 100644 --- a/display-manager-run.service +++ b/display-manager-run.service @@ -4,7 +4,8 @@ Description=Weston display daemon [Service] User=display WorkingDirectory=/run/%u -ExecStart=/bin/sh -c 'backend=drm ; [ -d /dev/dri ] || backend=fbdev ; exec /usr/bin/weston --backend=$backend-backend.so -i0 --log=%h/weston.log' +# FIXME: log files shouldn't be stored in tmpfs directories (can get quite big and have side effects) +ExecStart=/bin/sh -c 'backend=drm ; [ -d /dev/dri ] || backend=fbdev ; exec /usr/bin/weston --backend=$backend-backend.so -i0 --log=/run/%u/weston.log' StandardInput=tty TTYPath=/dev/tty7 EnvironmentFile=/etc/sysconfig/weston diff --git a/packaging/weston-common.spec b/packaging/weston-common.spec index 5b44e3e..b7b45e3 100644 --- a/packaging/weston-common.spec +++ b/packaging/weston-common.spec @@ -105,17 +105,17 @@ install -m 0644 weston.ini %{buildroot}%{weston_config_dir} # open the graphics device mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d cat >%{buildroot}%{_sysconfdir}/udev/rules.d/99-dri.rules <<'EOF' -SUBSYSTEM=="drm", MODE="0660", GROUP="%{daemon_group}", SMACK="*" +SUBSYSTEM=="drm", MODE="0660", GROUP="%{daemon_group}", SECLABEL{smack}="*" EOF # user 'display' must own /dev/tty7 for weston to start correctly cat >%{buildroot}%{_sysconfdir}/udev/rules.d/99-tty.rules <<'EOF' -SUBSYSTEM=="tty", KERNEL=="tty7", OWNER="%{daemon_user}", SMACK="^" +SUBSYSTEM=="tty", KERNEL=="tty7", OWNER="%{daemon_user}", SECLABEL{smack}="^" EOF # user 'display' must also be able to access /dev/input/event* cat >%{buildroot}%{_sysconfdir}/udev/rules.d/99-input.rules <<'EOF' -SUBSYSTEM=="input", KERNEL=="event*", MODE="0660", GROUP="input", SMACK="^" +SUBSYSTEM=="input", KERNEL=="event*", MODE="0660", GROUP="input", SECLABEL{smack}="^" EOF # install desktop file |