weston-init: Let weston run without pam on distros without pam
PATCH 1/1 weston-init: Let weston run without pam on distros without pam
When pam is not part of distro, user specific XDG_* environment variables are not available since PAMName=login is in-effective and as a result weston can not start because it direly needs XDG_RUNTIME_DIR defined, therefore launching weston directly in systemd service will not work, therefore call the helper script weston-start, which is also used with sysvinit
extend enabling fbdev backend fallback to all qemu machines
---
.../{qemux86-64 => qemuall}/weston.ini | 0
.../wayland/weston-init/qemux86/weston.ini | 2 --
.../wayland/weston-init/[email protected] | 34 ++++---------------
3 files changed, 6 insertions(+), 30 deletions(-)
rename meta/recipes-graphics/wayland/weston-init/{qemux86-64 => qemuall}/weston.ini (100%)
delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86/weston.inimeta/recipes-graphics/wayland/weston-init/qemuall/weston.ini renamed from meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini +0 -0
meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini deleted +0 -2
@@ -1,2 +0,0 @@ -[core] -backend=fbdev-backend.so
meta/recipes-graphics/wayland/weston-init/[email protected] +6 -28
@@ -1,37 +1,15 @@ [Unit] -Description=Weston Wayland Compositor (on tty7) +Description=Weston Wayland Compositor RequiresMountsFor=/run [email protected] plymouth-quit.service -After=systemd-user-sessions.service [email protected] 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
Signature · 1 line
2.24.1
Quoted 8 lines · Khem Raj
When pam is not part of distro, user specific XDG_* environment variables are not available since PAMName=login is in-effective and as a result weston can not start because it direly needs
XDG_RUNTIME_DIRdefined, therefore launching weston directly in systemd service will not work, therefore call the helper script weston-start, which is also used with sysvinitextend enabling fbdev backend fallback to all qemu machines
Looks good to me, thanks !