[neon/neon/calamares-settings/Neon/unstable] oem-prepare: reinstste login.defs just befor bootiing into user

[Carlos De Maine]

Git commit 6db1bf71022e0adaacb9a51066d7ab3d96aa4b1e by Carlos De Maine.
Committed on 19/02/2026 at 04:59.
Pushed by carlosdem into branch 'Neon/unstable'.

reinstste login.defs just befor bootiing into user

if reinstated earlier the sed doesn't seem to work properly ?? \o/ ??

M  +4    -0    oem-prepare/calamares/oem-prepare/prepare-system/calamares-oem-prepare-root
M  +1    -3    oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure

https://invent.kde.org/neon/neon/calamares-settings/-/commit/6db1bf71022e0adaacb9a51066d7ab3d96aa4b1e

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 1c08ae2..9b922db 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
@@ -71,4 +71,8 @@ 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/usr/sbin/calamares-oem-uid-undo-and-configure b/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure
index 1f78635..139050e 100755
--- a/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure
+++ b/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure
@@ -9,9 +9,7 @@ set -ex
 
 ROOT=$1
 
-mv $ROOT/etc/login.defs.oem $ROOT/etc/login.defs
-
-# ... and then do some special modifications to configure the oem user
+# ... 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