diff options
Diffstat (limited to 'poky/meta/recipes-graphics/wayland/weston-init/weston@.service')
-rw-r--r-- | poky/meta/recipes-graphics/wayland/weston-init/weston@.service | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/poky/meta/recipes-graphics/wayland/weston-init/weston@.service b/poky/meta/recipes-graphics/wayland/weston-init/weston@.service index 9ecf2ab06..39e193014 100644 --- a/poky/meta/recipes-graphics/wayland/weston-init/weston@.service +++ b/poky/meta/recipes-graphics/wayland/weston-init/weston@.service @@ -1,37 +1,15 @@ [Unit] -Description=Weston Wayland Compositor (on tty7) +Description=Weston Wayland Compositor RequiresMountsFor=/run -Conflicts=getty@tty7.service plymouth-quit.service -After=systemd-user-sessions.service getty@tty7.service plymouth-quit-wait.service +Conflicts=plymouth-quit.service +After=systemd-user-sessions.service plymouth-quit-wait.service [Service] User=%i -PermissionsStartOnly=true - -# Log us in via PAM so we get our XDG & co. environment and -# are treated as logged in so we can use the tty: PAMName=login - -# Grab tty7 -UtmpIdentifier=tty7 -TTYPath=/dev/tty7 -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes - -# stderr to journal so our logging doesn't get thrown into /dev/null -StandardOutput=tty -StandardInput=tty -StandardError=journal - EnvironmentFile=-/etc/default/weston - -# Weston does not successfully change VT, nor does systemd place us on -# the VT it just activated for us. Switch manually: -ExecStartPre=/usr/bin/chvt 7 -ExecStart=/usr/bin/weston --log=${XDG_RUNTIME_DIR}/weston.log $OPTARGS - +StandardError=journal +PermissionsStartOnly=true IgnoreSIGPIPE=no -#[Install] -#Alias=multi-user.target.wants/weston.service +ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS |