diff options
Diffstat (limited to 'meta/recipes-graphics/wayland/weston-init')
-rw-r--r-- | meta/recipes-graphics/wayland/weston-init/71-weston-drm.rules | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston-init/weston.service (renamed from meta/recipes-graphics/wayland/weston-init/weston@.service) | 14 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston-init/weston.socket | 14 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston-init/weston@.socket | 10 |
4 files changed, 24 insertions, 16 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/71-weston-drm.rules b/meta/recipes-graphics/wayland/weston-init/71-weston-drm.rules deleted file mode 100644 index 1a1b8bbda4..0000000000 --- a/meta/recipes-graphics/wayland/weston-init/71-weston-drm.rules +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fb0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="weston@root.service" | ||
2 | ACTION=="add", SUBSYSTEM=="drm", KERNEL=="card0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="weston@root.service" | ||
diff --git a/meta/recipes-graphics/wayland/weston-init/weston@.service b/meta/recipes-graphics/wayland/weston-init/weston.service index ce8f4fb71a..e09625b31c 100644 --- a/meta/recipes-graphics/wayland/weston-init/weston@.service +++ b/meta/recipes-graphics/wayland/weston-init/weston.service | |||
@@ -9,6 +9,7 @@ Documentation=man:weston(1) man:weston.ini(5) | |||
9 | Documentation=http://wayland.freedesktop.org/ | 9 | Documentation=http://wayland.freedesktop.org/ |
10 | 10 | ||
11 | # Make sure we are started after logins are permitted. | 11 | # Make sure we are started after logins are permitted. |
12 | Requires=systemd-user-sessions.service | ||
12 | After=systemd-user-sessions.service | 13 | After=systemd-user-sessions.service |
13 | 14 | ||
14 | # If Plymouth is used, we want to start when it is on its way out. | 15 | # If Plymouth is used, we want to start when it is on its way out. |
@@ -18,6 +19,9 @@ After=plymouth-quit-wait.service | |||
18 | Wants=dbus.socket | 19 | Wants=dbus.socket |
19 | After=dbus.socket | 20 | After=dbus.socket |
20 | 21 | ||
22 | # Ensure the socket is present | ||
23 | Requires=weston.socket | ||
24 | |||
21 | # Since we are part of the graphical session, make sure we are started before | 25 | # Since we are part of the graphical session, make sure we are started before |
22 | # it is complete. | 26 | # it is complete. |
23 | Before=graphical.target | 27 | Before=graphical.target |
@@ -37,10 +41,11 @@ TimeoutStartSec=60 | |||
37 | WatchdogSec=20 | 41 | WatchdogSec=20 |
38 | 42 | ||
39 | # The user to run Weston as. | 43 | # The user to run Weston as. |
40 | User=%I | 44 | User=weston |
45 | Group=weston | ||
41 | 46 | ||
42 | # Make sure working directory is users home directory | 47 | # Make sure the working directory is the users home directory |
43 | WorkingDirectory=/home/%i | 48 | WorkingDirectory=/home/weston |
44 | 49 | ||
45 | # Set up a full user session for the user, required by Weston. | 50 | # Set up a full user session for the user, required by Weston. |
46 | PAMName=weston-autologin | 51 | PAMName=weston-autologin |
@@ -61,5 +66,6 @@ UtmpIdentifier=tty7 | |||
61 | UtmpMode=user | 66 | UtmpMode=user |
62 | 67 | ||
63 | [Install] | 68 | [Install] |
69 | # Note: If you only want weston to start on-demand, remove this line with a | ||
70 | # service drop file | ||
64 | WantedBy=graphical.target | 71 | WantedBy=graphical.target |
65 | DefaultInstance=tty7 | ||
diff --git a/meta/recipes-graphics/wayland/weston-init/weston.socket b/meta/recipes-graphics/wayland/weston-init/weston.socket new file mode 100644 index 0000000000..c1bdc83c05 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston-init/weston.socket | |||
@@ -0,0 +1,14 @@ | |||
1 | [Unit] | ||
2 | Description=Weston socket | ||
3 | RequiresMountsFor=/run | ||
4 | |||
5 | [Socket] | ||
6 | ListenStream=/run/wayland-0 | ||
7 | SocketMode=0775 | ||
8 | SocketUser=weston | ||
9 | SocketGroup=wayland | ||
10 | RemoveOnStop=yes | ||
11 | |||
12 | [Install] | ||
13 | WantedBy=sockets.target | ||
14 | |||
diff --git a/meta/recipes-graphics/wayland/weston-init/weston@.socket b/meta/recipes-graphics/wayland/weston-init/weston@.socket deleted file mode 100644 index f1790d74a8..0000000000 --- a/meta/recipes-graphics/wayland/weston-init/weston@.socket +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=Weston Wayland socket | ||
3 | After=user-runtime-dir@1000.service | ||
4 | |||
5 | [Socket] | ||
6 | ListenStream=/run/user/1000/wayland-%I | ||
7 | |||
8 | [Install] | ||
9 | WantedBy=sockets.target | ||
10 | |||