From 59c77bb547d964bb711cccdd0b4bf484bc4725bf Mon Sep 17 00:00:00 2001 From: Hadi Chokr Date: Tue, 14 Apr 2026 08:27:07 +0200 Subject: [PATCH] Be very late in the build step so doenst tumble over weird sysusers with home dirs. --- mkosi.finalize.d/99-etc.sh.chroot | 7 +++++++ mkosi.postinst.chroot | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mkosi.finalize.d/99-etc.sh.chroot b/mkosi.finalize.d/99-etc.sh.chroot index 7ff8ad5..92776ea 100755 --- a/mkosi.finalize.d/99-etc.sh.chroot +++ b/mkosi.finalize.d/99-etc.sh.chroot @@ -18,6 +18,13 @@ echo "auth optional pam_faildelay.so delay=0" >> /usr/lib/pam.d/syste echo "# Default of 3 is way too harsh" >> /etc/security/faillock.conf echo "deny = 12" >> /etc/security/faillock.conf +# Set BTRFS_SUBVOLUME_HOME for new users +if grep -q '^BTRFS_SUBVOLUME_HOME=' /etc/default/useradd; then + sed -i 's%^BTRFS_SUBVOLUME_HOME=.*%BTRFS_SUBVOLUME_HOME=yes%' /etc/default/useradd +else + echo 'BTRFS_SUBVOLUME_HOME=yes' >> /etc/default/useradd +fi + # Make double sure we don't seed random pam.d files from factory etc! # https://invent.kde.org/kde-linux/kde-linux/-/issues/165 rm --recursive --force /usr/share/factory/etc/pam.d diff --git a/mkosi.postinst.chroot b/mkosi.postinst.chroot index b26d9cb..8e59ceb 100755 --- a/mkosi.postinst.chroot +++ b/mkosi.postinst.chroot @@ -141,13 +141,6 @@ sed -i 's%^SHELL=/usr/bin/bash%SHELL=/usr/bin/zsh%' /etc/default/useradd # Put new users in sambashare group sed -i 's%^GROUP=users%GROUP=users\nGROUPS=sambashare%' /etc/default/useradd -# Set BTRFS_SUBVOLUME_HOME for new users -if grep -q '^BTRFS_SUBVOLUME_HOME=' /etc/default/useradd; then - sed -i 's%^BTRFS_SUBVOLUME_HOME=.*%BTRFS_SUBVOLUME_HOME=yes%' /etc/default/useradd -else - echo 'BTRFS_SUBVOLUME_HOME=yes' >> /etc/default/useradd -fi - # Our Plymouth Theme KEEP_THEME="breeze-bgrt"