Casper

Merge ~dbungert/casper:fix-version into casper:main

  1. Git
  2. lp:~dbungert/casper
  3. fix-version
  4. Merge into main
Proposed by Dan Bungert
Status: Merged
Merge reported by: Dan Bungert
Merged at revision: f896918639d71b1c8577b16756dbd5615bc8816e
Proposed branch: ~dbungert/casper:fix-version
Merge into: casper:main
Diff against target: 76 lines (+10/-11)
4 files modified
bin/casper-snapshot (+1/-1)
debian/changelog (+7/-1)
scripts/casper-bottom/15autologin (+0/-3)
scripts/casper-bottom/25adduser (+2/-6)
Reviewer Review Type Date Requested Status
Simon Quigley Pending
Steve Langasek Pending
Ubuntu Installer Team Pending
Review via email: mp+440075@code.launchpad.net

Commit message

Fix git history

Archive and git history are out of sync right now, with lp:casper not containing 5aaf45b66d124bc87d38b92bdaa963f1863b9210 + changelog differences. This MP aims to correct that.

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

Merging

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/casper-snapshot b/bin/casper-snapshot
2index ab07529..33243f6 100755
3--- a/bin/casper-snapshot
4+++ b/bin/casper-snapshot
5@@ -33,7 +33,7 @@ VERSION=0.0.1
6 if [ -e /etc/casper.conf ]; then
7 . /etc/casper.conf
8 else
9- USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
10+ USERNAME=$(cat /etc/passwd | grep "1000" | cut -f1 -d ':')
11 HOSTNAME=$(hostname)
12 BUILD_SYSTEM="Debian"
13 fi
14diff --git a/debian/changelog b/debian/changelog
15index d6f7ff6..89facce 100644
16--- a/debian/changelog
17+++ b/debian/changelog
18@@ -1,4 +1,4 @@
19-casper (1.478) lunar; urgency=medium
20+casper (1.480) lunar; urgency=medium
21
22 * Use --try-or-install in the systemd unit of the new desktop installer,
23 fixes the try/install page not being displayed
24@@ -6,6 +6,12 @@ casper (1.478) lunar; urgency=medium
25
26 -- Sebastien Bacher <seb128@ubuntu.com> Sun, 05 Feb 2023 11:39:30 +0100
27
28+casper (1.479) lunar; urgency=medium
29+
30+ * Fix adduser, which fails due to systemd taking 999 (LP: #2004092).
31+
32+ -- Simon Quigley <tsimonq2@ubuntu.com> Sat, 28 Jan 2023 21:09:53 -0600
33+
34 casper (1.477) lunar; urgency=medium
35
36 * The Type=simple change wasn't needed to see the startup time improvement.
37diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
38index d6c75e6..c80e205 100755
39--- a/scripts/casper-bottom/15autologin
40+++ b/scripts/casper-bottom/15autologin
41@@ -90,9 +90,6 @@ if [ -f /root/usr/bin/sddm ]; then
42 sddm_session=QLubuntu.desktop
43 fi
44 cat >>/root/etc/sddm.conf <<EOF
45-[Users]
46-MinimumUid=999
47-
48 [Autologin]
49 User=$USERNAME
50 Session=$sddm_session
51diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
52index 8320e71..efbf567 100755
53--- a/scripts/casper-bottom/25adduser
54+++ b/scripts/casper-bottom/25adduser
55@@ -57,7 +57,8 @@ db_set passwd/root-password-crypted '*'
56 db_set passwd/user-password-crypted U6aMy0wojraho
57 db_set passwd/user-fullname "$USERFULLNAME"
58 db_set passwd/username "$USERNAME"
59-db_set passwd/user-uid 999
60+# Per LP: #2004092, systemd uses 995-999
61+db_set passwd/user-uid 1000
62
63 chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
64 if [ ! -f /root/usr/bin/sddm ]; then
65@@ -93,11 +94,6 @@ for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde
66 fi
67 done
68
69-# GDM
70-if [ -d /root/etc/gdm3 ]; then
71- sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
72-fi
73-
74 # Kubuntu
75 if [ -f "/root/usr/bin/plasma-desktop" ]; then
76 if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then

Subscribers

People subscribed via source and target branches