From 10ac38ddd38673c55efa83bbccbc78529289cf07 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Wed, 20 Mar 2024 14:33:17 +0000 Subject: [PATCH] mkosi: Remove testuser from base/mkosi.postinst.chroot The testuser user is only needed for integration tests, which are used in the system user and this config can be provided as drop-ins instead of inline in postinst scripts. --- mkosi.images/base/mkosi.postinst.chroot | 11 ----------- .../mkosi.extra/usr/lib/sysusers.d/testuser.conf | 1 + .../mkosi.extra/usr/lib/tmpfiles.d/testuser.conf | 1 + 3 files changed, 2 insertions(+), 11 deletions(-) create mode 100644 mkosi.images/system/mkosi.extra/usr/lib/sysusers.d/testuser.conf create mode 100644 mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/testuser.conf diff --git a/mkosi.images/base/mkosi.postinst.chroot b/mkosi.images/base/mkosi.postinst.chroot index 26459b165de..d1052694aa7 100755 --- a/mkosi.images/base/mkosi.postinst.chroot +++ b/mkosi.images/base/mkosi.postinst.chroot @@ -65,17 +65,6 @@ fi mountpoint -q /etc/resolv.conf && umount /etc/resolv.conf rm -f /etc/resolv.conf -. /usr/lib/os-release - -mkdir -p /usr/lib/sysusers.d -cat >/usr/lib/sysusers.d/testuser.conf </usr/lib/tmpfiles.d/testuser.conf </dev/null; then # Ensure that side-loaded PE addons are loaded if signed, and ignored if not diff --git a/mkosi.images/system/mkosi.extra/usr/lib/sysusers.d/testuser.conf b/mkosi.images/system/mkosi.extra/usr/lib/sysusers.d/testuser.conf new file mode 100644 index 00000000000..9d65a0ee09b --- /dev/null +++ b/mkosi.images/system/mkosi.extra/usr/lib/sysusers.d/testuser.conf @@ -0,0 +1 @@ +u testuser 4711 "Test User" /home/testuser diff --git a/mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/testuser.conf b/mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/testuser.conf new file mode 100644 index 00000000000..1b6ecb6f541 --- /dev/null +++ b/mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/testuser.conf @@ -0,0 +1 @@ +q /home/testuser 0700 4711 4711