Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
144011fe
Commit
144011fe
authored
1 year ago
by
Luis Guzmán
Browse files
Options
Downloads
Patches
Plain Diff
casper: tune liveuser uid for higher systemd-journal version.
parent
1afafb23
No related branches found
No related tags found
1 merge request
!1227
casper: tune liveuser uid for higher systemd-journal version.
Pipeline
#1133
passed
1 year ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
helpers/DATA/casper/set_liveuser_uid_1000.patch
+53
-0
53 additions, 0 deletions
helpers/DATA/casper/set_liveuser_uid_1000.patch
helpers/make-casper
+4
-1
4 additions, 1 deletion
helpers/make-casper
with
57 additions
and
1 deletion
helpers/DATA/casper/set_liveuser_uid_1000.patch
0 → 100644
+
53
−
0
View file @
144011fe
diff --git a/bin/casper-snapshot b/bin/casper-snapshot
index ab075292..33243f63 100755
--- a/bin/casper-snapshot
+++ b/bin/casper-snapshot
@@ -33,7 +33,7 @@
VERSION=0.0.1
if [ -e /etc/casper.conf ]; then
. /etc/casper.conf
else
- USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
+ USERNAME=$(cat /etc/passwd | grep "1000" | cut -f1 -d ':')
HOSTNAME=$(hostname)
BUILD_SYSTEM="Debian"
fi
diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
index d6c75e66..c80e2058 100755
--- a/scripts/casper-bottom/15autologin
+++ b/scripts/casper-bottom/15autologin
@@ -90,9 +90,6 @@
if [ -f /root/usr/bin/sddm ]; then
sddm_session=QLubuntu.desktop
fi
cat >>/root/etc/sddm.conf <<EOF
-[Users]
-MinimumUid=999
-
[Autologin]
User=$USERNAME
Session=$sddm_session
diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
index 8320e710..efbf5677 100755
--- a/scripts/casper-bottom/25adduser
+++ b/scripts/casper-bottom/25adduser
@@ -57,7 +57,8 @@
db_set passwd/root-password-crypted '*'
db_set passwd/user-password-crypted U6aMy0wojraho
db_set passwd/user-fullname "$USERFULLNAME"
db_set passwd/username "$USERNAME"
-db_set passwd/user-uid 999
+# Per LP: #2004092, systemd uses 995-999
+db_set passwd/user-uid 1000
chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
if [ ! -f /root/usr/bin/sddm ]; then
@@ -93,11 +94,6 @@
for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde
fi
done
-# GDM
-if [ -d /root/etc/gdm3 ]; then
- sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
-fi
-
# Kubuntu
if [ -f "/root/usr/bin/plasma-desktop" ]; then
if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then
This diff is collapsed.
Click to expand it.
helpers/make-casper
+
4
−
1
View file @
144011fe
...
...
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION
=
1
7
VERSION
=
1
8
.
./config
...
...
@@ -45,6 +45,9 @@ sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions
# Set trisquel isos as default suggestion.
patch
--no-backup-if-mismatch
-p1
<
$DATA
/set_trisquel_iso_suggestion.patch
# FIX T11 only: Set live user uid as 1000, which fails due to
# systemd taking 999 in later versions (LP: #2004092) remove on T12.
patch
--no-backup-if-mismatch
-p1
<
$DATA
/set_liveuser_uid_1000.patch
changelog
"Compiled for Trisquel"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment