Merge pull request #31870 from CodethinkLabs/base-image-tweaks

Base image tweaks
2024-03-25 18:04:49 +01:00
parent 650421fb8e 23a617fd8a
commit 1654330d31
4 changed files with 4 additions and 11 deletions
@@ -52,4 +52,6 @@ Packages=
        vim-common

 InitrdPackages=
+        setools
+        selinux-policy
        tpm2-tools
@@ -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 <<EOF
-u	testuser	4711	"Test User"	/home/testuser
-EOF
-mkdir -p /usr/lib/tmpfiles.d
-cat >/usr/lib/tmpfiles.d/testuser.conf <<EOF
-q	/home/testuser	0700	4711	4711
-EOF
-
 # sbsign is not available on CentOS Stream
 if command -v sbsign &>/dev/null; then
    # Ensure that side-loaded PE addons are loaded if signed, and ignored if not
@@ -0,0 +1 @@
+u	testuser	4711	"Test User"	/home/testuser
@@ -0,0 +1 @@
+q	/home/testuser	0700	4711	4711