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

fedora-arm-base.ks

@@ -53,7 +53,7 @@ cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm --eval '%{fedora}')
 basearch=armhfp
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this ARM disk image"

fedora-arm-workstation.ks

@@ -7,6 +7,8 @@ part / --size=6200 --fstype ext4
 %packages
 -initial-setup
 -initial-setup-gui
+-libvirt*
+-gnome-boxes
 
 %end
 

fedora-cinnamon-common.ks

@@ -12,8 +12,9 @@
 @cinnamon-desktop
 @libreoffice
 parole
+exaile
 
 # extra backgrounds
-f30-backgrounds-extras-gnome
+f31-backgrounds-extras-gnome
 
 %end

fedora-cloud-base.ks

@@ -215,7 +215,7 @@ truncate -c -s 0 /var/log/dnf.log
 truncate -c -s 0 /var/log/dnf.rpm.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm --eval '%{fedora}')
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 

fedora-cloud-bigdata.ks

@@ -182,7 +182,7 @@ dnf clean all
 truncate -c -s 0 /var/log/dnf.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm --eval '%{fedora}')
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 

fedora-cloud-experimental.ks

@@ -173,7 +173,7 @@ dnf clean all
 truncate -c -s 0 /var/log/dnf.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm --eval '%{fedora}')
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 

fedora-container-base.ks

@@ -3,7 +3,7 @@
 
 %include fedora-container-common.ks
 
-%packages --excludedocs --instLangs=en --nocore
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 rootfiles
 # https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
 fedora-repos-modular
@@ -13,6 +13,9 @@ dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
 sudo
+-glibc-langpack-en
+-cracklib-dicts
+-langpacks-en
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log
@@ -44,4 +47,19 @@ umount /run
 systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
 rm /run/nologin # https://pagure.io/atomic-wg/issue/316
 
+# Final pruning
+rm -rfv /var/cache/* /var/log/* /tmp/*
+
+%end
+
+%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
+set -eux
+
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
+# NOTE: run this in nochroot because "find" does not exist in chroot
+KEEPLANG=en_US
+for dir in locale i18n; do
+    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
+done
+
 %end

fedora-container-common.ks

@@ -29,7 +29,7 @@ zerombr
 clearpart --all
 autopart --noboot --nohome --noswap --nolvm
 
-%packages --excludedocs --instLangs=en --nocore
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 fedora-release-container
 bash
 coreutils
@@ -39,6 +39,8 @@ rpm
 shadow-utils
 sssd-client
 util-linux
+#needed by Anaconda https://bugzilla.redhat.com/show_bug.cgi?id=1744115
+systemd
 -kernel
 -dosfstools
 -e2fsprogs
@@ -61,9 +63,12 @@ set -eux
 LANG="en_US"
 echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1727489
+echo 'LANG="C.UTF-8"' >  /etc/locale.conf
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=1400682
 echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release-container)
+releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 
 echo "# fstab intentionally empty for containers" > /etc/fstab

fedora-disk-base.ks

@@ -62,7 +62,7 @@ glibc-all-langpacks
 # Setup Raspberry Pi firmware
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
 rpm -qa

fedora-disk-xfce.ks

@@ -0,0 +1,17 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-xfce-common.ks
+
+bootloader --append="cma=192MB"
+
+services --enabled=sshd,NetworkManager,chronyd,zram-swap
+
+autopart --type=plain --noswap
+
+%packages
+
+%end
+
+%post
+
+%end

fedora-iot.ks

@@ -5,11 +5,9 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 
-# Add most common consoles console=ttyAMA0 console=ttyS0 console=ttyS1 as kernel boot parameter
 bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
@@ -24,7 +22,7 @@ autopart --nohome --noswap --type=plain
 
 # Equivalent of %include fedora-repo.ks
 # Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/devel/${basearch}/iot
+ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/stable/${basearch}/iot
 
 reboot
 
@@ -37,28 +35,28 @@ if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 else
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
 fi
 fi
 
 # Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
 # We want consumers of this image to track the two week releases.
-ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/devel/${arch}/iot"
+ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/stable/${arch}/iot"
 
 # Make sure the ref we're supposedly sitting on (according
 # to the updated origin) exists.
-ostree refs "fedora-iot:fedora/devel/${arch}/iot" --create "fedora-iot:fedora/devel/${arch}/iot"
+ostree refs "fedora-iot:fedora/stable/${arch}/iot" --create "fedora-iot:fedora/stable/${arch}/iot"
 
 # Remove the old ref so that the commit eventually gets cleaned up.
-ostree refs "fedora-iot:fedora/devel/${arch}/iot" --delete
+ostree refs "fedora-iot:fedora/stable/${arch}/iot" --delete
 
 # delete/add the remote with new options to enable gpg verification
 # and to point them at the cdn url
 ostree remote delete fedora-iot
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-iot-2019 --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/ --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
 
-# We're gettin a stray console= from somewhere, work around it
+# We're getting a stray console= from somewhere, work around it
 rpm-ostree kargs --delete=console=tty0
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
@@ -68,13 +66,6 @@ passwd -l root
 # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
 cp /etc/skel/.bash* /var/roothome
 
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
 # Remove any persistent NIC rules generated by udev
 rm -vf /etc/udev/rules.d/*persistent-net*.rules
 # And ensure that we will do DHCP on eth0 on startup
@@ -105,9 +96,6 @@ echo "(Don't worry -- that out-of-space error was expected.)"
 # For trac ticket https://pagure.io/atomic-wg/issue/128
 rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
 
-echo "Adding Developer Mode GRUB2 menu item."
-/usr/libexec/atomic-devmode/bootentry add
-
 # Anaconda is writing an /etc/resolv.conf from the install environment.
 # The system should start out with an empty file, otherwise cloud-init
 # will try to use this information and may error:

fedora-kde-common.ks

@@ -6,6 +6,7 @@
 @kde-media
 @kde-office
 @networkmanager-submodules
+fedora-release-kde
 
 ### The KDE-Desktop
 

fedora-live-base.ks

@@ -45,7 +45,8 @@ kernel-modules-extra
 # This was added a while ago, I think it falls into the category of
 # "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
 # for now.
-memtest86+
+#memtest86+
+@x86-baremetal-tools # memtest86+ is included
 
 # The point of a live image is to install
 anaconda
@@ -58,7 +59,7 @@ aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
-syslinux
+# syslinux is in @x86-baremetal-tools
 
 # anaconda needs the locales available to run for different locales
 glibc-all-langpacks
@@ -224,7 +225,7 @@ touch /.liveimg-configured
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
 # the hostname must be something else than 'localhost'
 # https://bugzilla.redhat.com/show_bug.cgi?id=1370222
-echo "localhost-live" > /etc/hostname
+hostnamectl set-hostname "localhost-live"
 
 EOF
 
@@ -304,7 +305,7 @@ EOF
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
+releasever=$(rpm --eval '%{fedora}')
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"

fedora-live-design_suite.ks

@@ -32,8 +32,7 @@ powerline
 powerline-fonts
 
 # Extra wallpapers
-f28-backgrounds-extras-base
-f28-backgrounds-extras-gnome
+f31-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
@@ -41,8 +40,8 @@ f28-backgrounds-extras-gnome
 -rdesktop
 
 # temporarily removing conflicting application
--LuxRender-blender
 -mypaint
+-sparkleshare
 
 %end
 

fedora-live-games.ks

@@ -1,9 +1,16 @@
-# fedora-livedvd-games.ks
+# fedora-live-games.ks
 #
-# Maintainer(s):
+# Maintainer:
 # - Darryl T. Agostinelli <dagostinelli@gmail.com>
-# - Formerly maintained by Bruno Wolff III <bruno@wolff.to>
-# - Formerly maintained by Rahul Sundaram
+#   https://fedoraproject.org/wiki/User:Dagostinelli
+#
+# Former Maintainers:
+# - Bruno Wolff III <bruno@wolff.to>
+#   https://fedoraproject.org/wiki/User:Bruno
+#
+# - Rahul Sundaram <sundaram@fedoraproject.org>
+#   https://fedoraproject.org/wiki/User:Sundaram
+#
 
 %include fedora-live-xfce.ks
 
@@ -38,7 +45,6 @@ asc-music
 astromenace
 # beneath-a-steel-sky-cd scummvm games cut for size
 boswars
-btanks
 bzflag
 crossfire-client
 extremetuxracer
@@ -46,7 +52,7 @@ extremetuxracer
 freeciv
 freecol
 freedoom
-# freedroidrpg # Cut for size
+freedroidrpg
 frozen-bubble
 gl-117
 # glob2 - currently broken
@@ -57,18 +63,18 @@ tmw
 megaglest
 nethack-vultures
 netpanzer
-#neverball #cut for size
+neverball
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
 # supertux # Crashing
-#supertuxkart #remove for size
+supertuxkart
 ultimatestunts
 warzone2100
 wesnoth
 # worminator # Would pull in fluid-soundfont-lite-patches
-# warmux # Cut for size
-# xmoto # Cut for size
+warmux
+xmoto
 
 # traditional (small)
 
@@ -90,7 +96,6 @@ kcheckers
 knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
-londonlaw
 lordsawar
 # lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
@@ -100,7 +105,7 @@ pachi
 pioneers
 quarry
 # Ri-li cut for size
-# rogue # abandoned. Someone pick it up so we can include it again!
+# rogue # recently abandoned. Someone picked it up. Waiting for approval.
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures
 solarwolf
@@ -114,7 +119,6 @@ xblast
 auriferous
 alienblaster
 # duel3 # Would pull in fluid-soundfont-lite-patches
-lmarbles
 powermanga
 # raidem # Would pull in fluid-soundfont-lite-patches
 # raidem-music # Would pull in fluid-soundfont-lite-patches
@@ -153,7 +157,6 @@ pingus
 
 # puzzles (small)
 
-escape
 # gbrainy Removed for space - only game that pulls in mono
 magicor
 mirrormagic
@@ -172,8 +175,6 @@ PySolFC
 
 bygfoot
 celestia
-childsplay
-gcompris
 planets
 tuxpaint
 tuxpaint-stamps

fedora-live-jam_kde.ks

@@ -101,7 +101,6 @@ ladspa-cmt-plugins
 ladspa-fil-plugins
 ladspa-mcp-plugins
 ladspa-rev-plugins
-ladspa-swh-plugins
 ladspa-tap-plugins
 ladspa-vco-plugins
 

fedora-live-robotics.ks

@@ -27,9 +27,12 @@ mercurial
 -@graphical-internet
 -@games
 -@sound-and-video
+-@dial-up
+-@input-methods
+-@standard
 
 # Add a web browser
-firefox
+@firefox
 
 # Remove office suite
 -libreoffice-*
@@ -41,9 +44,11 @@ firefox
 # Drop things that pull in perl
 -linux-atm
 
-# No printing
+# No printing or scanning
 -foomatic-db-ppds
 -foomatic
+-sane-backends-drivers-scanners
+-libsane-hpaio
 
 # Dictionaries are big
 -aspell-*
@@ -52,6 +57,7 @@ firefox
 
 # Help and art can be big, too
 -gnome-user-docs
+-gnome-getting-started-docs
 -evolution-help
 -desktop-backgrounds-basic
 -*backgrounds-extras
@@ -60,7 +66,6 @@ firefox
 -krb5-auth-dialog
 -krb5-workstation
 -pam_krb5
--quota
 -nano
 -dos2unix
 -finger
@@ -69,10 +74,8 @@ firefox
 -mtr
 -pinfo
 -rsh
--nfs-utils
 -ypbind
 -yp-tools
--rpcbind
 -acpid
 -ntsysv
 
@@ -115,7 +118,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'eclipse.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'org.qt-project.qtcreator.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
 FOE
 
 fi

fedora-modular-disk-minimal.ks

@@ -58,7 +58,7 @@ dhcp-client
 # Setup Raspberry Pi firmware
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
-releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
+releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
 rpm -qa

fedora-python-classroom-common.ks

@@ -13,7 +13,9 @@ vim-enhanced
 wget
 
 # Remove Pythons possibly recommended by tox
+-python2
 -python26
+-python27
 -python33
 -python34
 -python35

fedora-repo.ks

@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented
 
 # For the master branch the following should be uncommented
-%include fedora-repo-rawhide.ks
+#%include fedora-repo-rawhide.ks
 
 # For non-master branches the following should be uncommented
-# %include fedora-repo-not-rawhide.ks
+ %include fedora-repo-not-rawhide.ks

fedora-scientific-common.ks

@@ -56,13 +56,10 @@ gcc-gfortran
 # GUI for R
 rkward
 
-# GUI for Octave
-qtoctave
-
 # julia
-# Comment out till build failure is sorted
-# julia
-# julia-doc
+julia
+julia-doc
+julia-devel
 
 # IDEs for the IDE folks
 @eclipse
@@ -70,7 +67,9 @@ qtoctave
 # Workaround for https://pagure.io/releng/issue/7814
 -eclipse-linuxtools-vagrant
 
-spyder
+python3-spyder
+python3-spyder-kernels
+
 
 #writing & publishing
 emacs
@@ -91,8 +90,8 @@ openmpi
 openmpi-devel
 valgrind-openmpi
 libgomp
-mpi4py-openmpi
 python3-mpi4py-openmpi
+python3-mpi4py-mpich
 
 #Version control- a GUI for each as well
 
@@ -114,7 +113,6 @@ libotf
 #root
 root
 root-gui-fitpanel
-root-python
 
 #Multiple jobs/clustering system
 # torque

fedora-soas-common.ks

@@ -30,7 +30,6 @@ firewall --enabled --service=mdns,presence
 -abrt-cli
 -ibus*
 -hyperv-daemons
--webkit2gtk3-plugin-process-gtk2
 
 # Add some extra fonts
 dejavu-sans-fonts
@@ -89,20 +88,20 @@ sugar-logos
 
 %post
 
-# Rebuild initrd for Sugar boot screen
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-/usr/sbin/plymouth-set-default-theme sugar
-dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
-
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
 Sugar on a Stick
 EOF
 cat /etc/fedora-release >> /boot/olpc_build
 
+# Rebuild initrd for Sugar boot screen
+KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
+/usr/sbin/plymouth-set-default-theme sugar
+dracut -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
 # Add our activities to the favorites
 cat > /usr/share/sugar/data/activities.defaults << EOF
 org.laptop.WebActivity

fedora-workstation-common.ks

@@ -8,6 +8,7 @@
 # Make sure to sync any additions / removals done here with
 # workstation-product-environment in comps
 @base-x
+@container-management
 @core
 @firefox
 @fonts