[neon/neon/calamares-settings/Neon/unstable] oem-prepare: move oem-uid-undo-and-configure to the very end

[Carlos De Maine]

Git commit 8286a37e7136a1226fb9204aa1daf96e6f6da921 by Carlos De Maine.
Committed on 19/02/2026 at 06:15.
Pushed by carlosdem into branch 'Neon/unstable'.

move oem-uid-undo-and-configure to the very end

so we don't clobber the login-defs before the useradd changes actually hit the disk

M  +0    -3    oem-prepare/calamares/oem-prepare/prepare-system/calamares-oem-prepare-root
M  +1    -1    oem-prepare/calamares/oem-prepare/settings.conf
M  +3    -2    oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure

https://invent.kde.org/neon/neon/calamares-settings/-/commit/8286a37e7136a1226fb9204aa1daf96e6f6da921

diff --git a/oem-prepare/calamares/oem-prepare/prepare-system/calamares-oem-prepare-root b/oem-prepare/calamares/oem-prepare/prepare-system/calamares-oem-prepare-root
index 9b922db..01a4150 100755
--- a/oem-prepare/calamares/oem-prepare/prepare-system/calamares-oem-prepare-root
+++ b/oem-prepare/calamares/oem-prepare/prepare-system/calamares-oem-prepare-root
@@ -72,7 +72,4 @@ rm -f /etc/NetworkManager/system-connections/*
 # Potentially sensitive.
 rm -f /home/oem/.ssh/known_hosts
 
-# reinstate login.defs and reset user uid & gid to 1000
-mv $ROOT/etc/login.defs.oem $ROOT/etc/login.defs
-
 ### end from oem-config
diff --git a/oem-prepare/calamares/oem-prepare/settings.conf b/oem-prepare/calamares/oem-prepare/settings.conf
index 8f6eb79..5fee5ea 100644
--- a/oem-prepare/calamares/oem-prepare/settings.conf
+++ b/oem-prepare/calamares/oem-prepare/settings.conf
@@ -57,7 +57,6 @@ sequence:
     - shellprocess at calamares-oem-uid
     - users
     - displaymanager
-    - shellprocess at calamares-oem-uid-undo-and-configure
     - networkcfg
     - hwclock
     - shellprocess at boot_deploy
@@ -73,6 +72,7 @@ sequence:
     - packages
     - neon-fs-cleanup
     - oemid
+    - shellprocess at calamares-oem-uid-undo-and-configure
     - shellprocess at logs
     - umount
   - show:
diff --git a/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure b/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure
index 139050e..a2eb6db 100755
--- a/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure
+++ b/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure
@@ -7,9 +7,10 @@
 
 set -ex
 
-ROOT=$1
+ROOT=$1# reinstate login.defs and reset user uid & gid to 1000
+mv $ROOT/etc/login.defs.oem $ROOT/etc/login.defs
 
-# ... do some special modifications to configure the oem user
+# ... and also do some special modifications to configure the oem user
 
 mkdir -p $ROOT/home/oem/Desktop
 ln -s ../../../calamares/oem-prepare/oem-prepare.desktop $ROOT/home/oem/Desktop/oem-prepare.desktop