From 7d4785d5ae860a23d937e8ae1c749c412de9b774 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Thu, 7 Jul 2022 15:35:48 -0400
Subject: [PATCH] Fixes for systemd in el8 anaconda.. it's required, for
 reasons

---
 Rocky-8-Container-Base.ks    |  3 ++-
 Rocky-8-Container-Minimal.ks | 10 ++++++++++
 Rocky-8-Container-UBI.ks     |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Rocky-8-Container-Base.ks b/Rocky-8-Container-Base.ks
index 9473bcd..2d6deda 100644
--- a/Rocky-8-Container-Base.ks
+++ b/Rocky-8-Container-Base.ks
@@ -29,8 +29,9 @@ binutils
 coreutils-single
 glibc-minimal-langpack
 hostname
-iputils
+iputils # this pulls in systemd, lets ask for it by name, too
 less
+systemd
 rocky-release
 rootfiles
 tar
diff --git a/Rocky-8-Container-Minimal.ks b/Rocky-8-Container-Minimal.ks
index c8e5086..a0b05d2 100644
--- a/Rocky-8-Container-Minimal.ks
+++ b/Rocky-8-Container-Minimal.ks
@@ -27,6 +27,7 @@ autopart --noboot --nohome --noswap --nolvm --fstype=ext4
 bash
 coreutils-single
 glibc-minimal-langpack
+systemd
 microdnf
 rocky-release
 
@@ -81,6 +82,15 @@ for dir in $(ls -d "/usr/share/{locale,i18n}/*" | grep -v 'en_US\|all_languages\
 umount /run
 systemd-tmpfiles --create --boot
 
+# mask mounts and login bits
+systemctl mask \
+    console-getty.service \
+    dev-hugepages.mount \
+    getty.target \
+    sys-fs-fuse-connections.mount \
+    systemd-logind.service \
+    systemd-remount-fs.service
+
 # Cleanup the image
 rm -f /etc/udev/hwdb.bin
 rm -rf /usr/lib/udev/hwdb.d/ \
diff --git a/Rocky-8-Container-UBI.ks b/Rocky-8-Container-UBI.ks
index dc7dcbb..0410b1a 100644
--- a/Rocky-8-Container-UBI.ks
+++ b/Rocky-8-Container-UBI.ks
@@ -33,6 +33,7 @@ dmidecode
 findutils
 glibc-minimal-langpack
 libcurl
+systemd
 rocky-release
 rootfiles
 tar