From 43675318443ff0b57fcc8b2b47b213126616c2d8 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Tue, 14 Jul 2020 12:01:17 -0400
Subject: [PATCH] Revert "remove systemd package from fedora-container-base"

This reverts commit 57e13a1b8970c2e15d0c310aa871e4737781a23f.

I noticed that systemd-logind was causing problems in our
containers after a container rebuild of the f32 base image was
published about 5 days ago. I found that an issue[0] had been
filed about the problem, but that bug was reported against
Rawhide (f33). I then found that systemd had been removed from
the f32 base image after f32 was released.

This causes problems for users who expect stability out of Fedora
releases - changing the default package set means that a container
build that works one day can break the next. In our case, the
problem wasn't so much that systemd was removed, but that the unit
masks were removed. This causes some components of systemd to be
unable to function in a container, and puts a burden on users to
identify the problem.

https://pagure.io/releng/issue/9603

[0] https://bugzilla.redhat.com/show_bug.cgi?id=1841139
---
 fedora-container-base.ks   | 6 ++++++
 fedora-container-common.ks | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/fedora-container-base.ks b/fedora-container-base.ks
index 6d50e82..c3a97fa 100644
--- a/fedora-container-base.ks
+++ b/fedora-container-base.ks
@@ -26,6 +26,11 @@ rm -rf /tmp/*
 # https://pagure.io/atomic-wg/issue/308
 printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1576993
+systemctl disable dnf-makecache.timer
+
+#Mask mount units and getty service so that we don't get login prompt
+systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
 # Fix /run/lock breakage since it's not tmpfs in docker
@@ -39,6 +44,7 @@ printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 #   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
 #
 umount /run
+systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
 rm /run/nologin # https://pagure.io/atomic-wg/issue/316
 
 # Final pruning
diff --git a/fedora-container-common.ks b/fedora-container-common.ks
index 76e14ef..b380861 100644
--- a/fedora-container-common.ks
+++ b/fedora-container-common.ks
@@ -38,6 +38,8 @@ rpm
 shadow-utils
 sssd-client
 util-linux
+# needed by Anaconda https://bugzilla.redhat.com/show_bug.cgi?id=1744115
+systemd
 -kernel
 -dosfstools
 -e2fsprogs