Revert "remove systemd package from fedora-container-base"

This reverts commit 57e13a1b89.

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
This commit is contained in:
Randy Barlow 2020-07-14 13:30:31 -04:00
parent 3e16f700a8
commit b4e313947d
2 changed files with 8 additions and 0 deletions

View File

@ -26,6 +26,11 @@ rm -rf /tmp/*
# https://pagure.io/atomic-wg/issue/308 # https://pagure.io/atomic-wg/issue/308
printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf 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 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
# Fix /run/lock breakage since it's not tmpfs in docker # 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 # [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
# #
umount /run umount /run
systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
rm /run/nologin # https://pagure.io/atomic-wg/issue/316 rm /run/nologin # https://pagure.io/atomic-wg/issue/316
# Final pruning # Final pruning

View File

@ -39,6 +39,8 @@ rpm
shadow-utils shadow-utils
sssd-client sssd-client
util-linux util-linux
#needed by Anaconda https://bugzilla.redhat.com/show_bug.cgi?id=1744115
systemd
-kernel -kernel
-dosfstools -dosfstools
-e2fsprogs -e2fsprogs