summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@open.eurogiciel.org>2014-04-15 12:32:42 +0200
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>2014-04-15 12:32:42 +0200
commitb5a630548ac6fc8bbf24213b40eea772017af53b (patch)
treeb476b61e06f90b5a8187bbc27c8226a0a8fd9399
parent99b468df7e0f1d4554e154b38d338997c5227719 (diff)
downloadweston-common-b5a630548ac6fc8bbf24213b40eea772017af53b.tar.gz
weston-common-b5a630548ac6fc8bbf24213b40eea772017af53b.tar.bz2
weston-common-b5a630548ac6fc8bbf24213b40eea772017af53b.zip
fix smack permissions
Change-Id: Ifc47f4f7b7ab0f91ca1a9fdae25cb350f67a5329 Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
-rw-r--r--display-manager.service2
-rw-r--r--packaging/weston-generic.spec4
2 files changed, 4 insertions, 2 deletions
diff --git a/display-manager.service b/display-manager.service
index 8b50b3e..43efbb5 100644
--- a/display-manager.service
+++ b/display-manager.service
@@ -4,7 +4,9 @@ Requires=display-manager-run.service
After=display-manager-run.service
[Service]
+Type=oneshot
ExecStart=/usr/bin/chmod g+w /run/display/wayland-0
+ExecStart=/usr/bin/chsmack -a User /run/display/wayland-0
[Install]
WantedBy=graphical.target
diff --git a/packaging/weston-generic.spec b/packaging/weston-generic.spec
index 7a85711..a259926 100644
--- a/packaging/weston-generic.spec
+++ b/packaging/weston-generic.spec
@@ -114,12 +114,12 @@ 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", GROUP="%{daemon_group}", OWNER="%{daemon_user}", SMACK="*"
+SUBSYSTEM=="tty", KERNEL=="tty7", OWNER="%{daemon_user}", 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", SMACK="^"
EOF
# install desktop file