[OEM] [Kubuntu] In stage two, ensure we use Wayland, consistent with the rest of the session scripts.

This commit is contained in:
Simon Quigley 2025-04-09 05:06:25 -05:00
parent 7ba422ace8
commit 71f067fbba
2 changed files with 9 additions and 3 deletions

2
debian/changelog vendored
View File

@ -11,6 +11,8 @@ calamares-settings-ubuntu (1:25.04.24) UNRELEASED; urgency=medium
pkgselectprocess, not packages. This was preventing the OEM processing pkgselectprocess, not packages. This was preventing the OEM processing
step (as opposed to just the GUI configuration) to be missing step (as opposed to just the GUI configuration) to be missing
(LP: #2104343). (LP: #2104343).
* [OEM] [Kubuntu] In stage two, ensure we use Wayland, consistent with the
rest of the session scripts.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 09 Apr 2025 01:55:07 -0500 -- Simon Quigley <tsimonq2@ubuntu.com> Wed, 09 Apr 2025 01:55:07 -0500

View File

@ -1,11 +1,15 @@
#!/bin/bash #!/bin/bash
# Starts the Kubuntu OEM Environment. # Starts the Kubuntu OEM Environment.
export XDG_SESSION_CLASS="user"
export XDG_SESSION_DESKTOP="KDE"
export DESKTOP_SESSION="plasma"
export QT_QPA_PLATFORMTHEME="kde" export QT_QPA_PLATFORMTHEME="kde"
export BROWSER='sudo -H -u kubuntu firefox' export BROWSER='sudo -H -u kubuntu firefox'
/usr/bin/kwin_x11 & /usr/bin/kwin_wayland --no-lockscreen &
while [ ! -e "/run/user/$(id -u)/wayland-0" ]; do sleep 1; done
/usr/bin/basicwallpaper /usr/share/wallpapers/Next/contents/3840x2160.png & /usr/bin/basicwallpaper /usr/share/wallpapers/Next/contents/3840x2160.png &
sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded. WAYLAND_DISPLAY="wayland-0" sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.
# If it exits... # If it exits...
killall basicwallpaper killall basicwallpaper
killall kwin_x11 killall kwin_wayland