Merge ~ubuntustudio-dev/casper:main into casper:main

[Erich Eickmeyer]

Switch Ubuntu Studio autologin to plasmax11

With the switch to Plasma 6, Ubuntu Studio's autologin no longer works as plasma.desktop is now plasmax11.desktop.

While the default session will be wayland after installation, during installation, for compatibility with virtual machines for testing reasons, an X11 session is desired.

[Dan Bungert (dbungert)]

Hi Erich,

The change looks reasonable. I really know nothing though about plasma though. Is there benefit to just adding the new elif case and leaving the existing one, or do you have reason to be certain that plasma.desktop is not to be considered?

review: Needs Information

[Erich Eickmeyer (eeickmeyer)]

Considering plasma.desktop no longer exists in /usr/share/xsessions in oracular onward, it shouldn't be considered unless one wants to boot into the wayland session which, in my testing, is problematic on virtual machines, namely virtualbox. The only two sessions that exist are /usr/share/xsessions/plasmax11.desktop and /usr/share/wayland-sessions/plasma.desktop.

This could also have been accomplished with a symlink, but this method seemed to be more correct.

[Dan Bungert (dbungert)]

LGTM, sponsoring

review: Approve

diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
index e66f06b..dea948c 100755
--- a/scripts/casper-bottom/15autologin
+++ b/scripts/casper-bottom/15autologin
@@ -54,8 +54,8 @@ if [ -f /root/usr/bin/sddm ]; then
     if [ -f /root/usr/share/xsessions/kubuntu-live-environment.desktop ]; then
         sddm_session=kubuntu-live-environment.desktop
     # Ubuntu Studio
-    elif [ -f /root/usr/share/xsessions/plasma.desktop ]; then
-        sddm_session=plasma.desktop
+    elif [ -f /root/usr/share/xsessions/plasmax11.desktop ]; then
+        sddm_session=plasmax11.desktop
     # Lubuntu
     elif [ -f /root/usr/share/xsessions/lubuntu-live-environment.desktop ]; then
         sddm_session=lubuntu-live-environment.desktop