Merge ~arraybolt3/casper:main into casper:main

Proposed by Aaron Rainbolt
Status: Merged
Merged at revision: 164c566ece29b0dd652872e2a2a70bab87dba2e1
Proposed branch: ~arraybolt3/casper:main
Merge into: casper:main
Diff against target: 13 lines (+1/-1)
1 file modified
scripts/casper-bottom/15autologin (+1/-1)
Reviewer Review Type Date Requested Status
Dan Bungert (community) Approve
Ubuntu Installer Team Pending
Review via email: mp+479323@code.launchpad.net

Description of the change

kubuntu-live-environment.desktop is now a Wayland session, not an X session, and its location has changed to reflect that fact. Casper needs to look in the real location for this to work, otherwise Kubuntu ends up using Ubuntu Studio's sddm.conf autologin settings, resulting in the wrong session being used.

To post a comment you must log in.
Revision history for this message
Dan Bungert (dbungert) wrote :

LGTM, uploading.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
index dea948c..5d82d20 100755
--- a/scripts/casper-bottom/15autologin
+++ b/scripts/casper-bottom/15autologin
@@ -51,7 +51,7 @@ fi
51# Configure SDDM autologin51# Configure SDDM autologin
52if [ -f /root/usr/bin/sddm ]; then52if [ -f /root/usr/bin/sddm ]; then
53 # Kubuntu53 # Kubuntu
54 if [ -f /root/usr/share/xsessions/kubuntu-live-environment.desktop ]; then54 if [ -f /root/usr/share/wayland-sessions/kubuntu-live-environment.desktop ]; then
55 sddm_session=kubuntu-live-environment.desktop55 sddm_session=kubuntu-live-environment.desktop
56 # Ubuntu Studio56 # Ubuntu Studio
57 elif [ -f /root/usr/share/xsessions/plasmax11.desktop ]; then57 elif [ -f /root/usr/share/xsessions/plasmax11.desktop ]; then

Subscribers

People subscribed via source and target branches