ubiquity

Merge lp:~rikmills/ubiquity/bug1447144 into lp:ubiquity

  1. bug1447144
  2. Merge into trunk
Proposed by Rik Mills
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 6593
Merged at revision: 6598
Proposed branch: lp:~rikmills/ubiquity/bug1447144
Merge into: lp:ubiquity
Diff against target: 27 lines (+10/-0)
1 file modified
bin/oem-config-firstboot (+10/-0)
To merge this branch: bzr merge lp:~rikmills/ubiquity/bug1447144
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+341228@code.launchpad.net

Description of the change

Mark sddm.conf with a comment before first run OEM user setup, to
show this is the original unmodifed version. Remove this version
after setup if it has not been replaced with a version configuring
auto-login for the real end user. Fixes sddm failing to re-start
with a black screen when an end user chooses to always login with a
password. (LP: #1447144)

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

That will work; thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/oem-config-firstboot'
2--- bin/oem-config-firstboot 2016-03-29 02:53:09 +0000
3+++ bin/oem-config-firstboot 2018-03-09 10:22:50 +0000
4@@ -32,6 +32,12 @@
5 done | debconf-communicate oem-config >/dev/null
6 fi
7
8+# if sddm.conf exists, add a comment to show that this is the original
9+# version which existed before end user setup was run
10+if [ -f "/etc/sddm.conf" ]; then
11+ echo "#original_oem_version" >> /etc/sddm.conf
12+fi
13+
14 # Remove the oem-config-prepare menu item.
15 rm -f /usr/share/applications/oem-config-prepare-gtk.desktop \
16 /usr/share/applications/kde4/oem-config-prepare-kde.desktop
17@@ -70,6 +76,10 @@
18 /usr/sbin/oem-config-wrapper $DEBUG $AUTOMATIC --only || CODE=$?
19 fi
20 if [ "$CODE" -eq 0 ]; then
21+ # if we still have the original sddm.conf, instead of a new version
22+ # added in user setup to enable auto-login, remove the original
23+ # which will break sddm startup if left in place
24+ grep -q '#original_oem_version' /etc/sddm.conf && rm -f /etc/sddm.conf
25 # Remove the temporary OEM configuration user, if possible
26 # and desired.
27 RET="$(echo GET oem-config/remove | debconf-communicate)"

Subscribers

People subscribed via source and target branches

to status/vote changes: