ELN: Sync with fedora-container-base.ks

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

fedora-eln-container-base.ks

@@ -1,77 +1,23 @@
 # See fedora-container-common.ks for details on how to hack on container image kickstarts
 # This base is a standard Fedora-ELN image with python3 and dnf
 
-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
-bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-keyboard us
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
-
-# boot partitions are irrelevant as the final docker image is a tarball
-zerombr
-clearpart --all
-autopart --noboot --nohome --noswap --nolvm
+%include fedora-container-common.ks
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+-fedora-release-container
 fedora-release-eln
-dnf-plugins-core
 fedora-repos-eln
-bash
-coreutils
-glibc-minimal-langpack
-rpm
-shadow-utils
-sssd-client
-util-linux
--kernel
--dosfstools
--e2fsprogs
--fuse-libs
--gnupg2-smime
--libss # used by e2fsprogs
--pinentry
--shared-mime-info
--trousers
--xkeyboard-config
--grubby
-
 rootfiles
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
-yum  # DNF compatibility with yum
-sssd-client
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sudo
 -glibc-langpack-en
 -langpacks-en
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log
-set -eux
-
-# Set install langs macro so that new rpms that get installed will
-# only install langs that we limit it to.
-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"
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-33-primary /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-primary
-
-# Disable conflicting repositories.
-dnf config-manager --disable "*rawhide*" "*cisco*"
-
-echo "# fstab intentionally empty for containers" > /etc/fstab
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
 # remove some extraneous files
 rm -rf /var/cache/dnf/*
 rm -rf /tmp/*
@@ -92,6 +38,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
+rm /run/nologin # https://pagure.io/atomic-wg/issue/316
 
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*