Casper

Merge ~arraybolt3/casper:main into casper:main

  1. Git
  2. lp:~arraybolt3/casper
  3. main
  4. Merge into 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
1diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
2index dea948c..5d82d20 100755
3--- a/scripts/casper-bottom/15autologin
4+++ b/scripts/casper-bottom/15autologin
5@@ -51,7 +51,7 @@ fi
6 # Configure SDDM autologin
7 if [ -f /root/usr/bin/sddm ]; then
8 # Kubuntu
9- if [ -f /root/usr/share/xsessions/kubuntu-live-environment.desktop ]; then
10+ if [ -f /root/usr/share/wayland-sessions/kubuntu-live-environment.desktop ]; then
11 sddm_session=kubuntu-live-environment.desktop
12 # Ubuntu Studio
13 elif [ -f /root/usr/share/xsessions/plasmax11.desktop ]; then

Subscribers

People subscribed via source and target branches