From 791b8bdffa773db52a39fa006de05ce26322dc27 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Fri, 18 Sep 2020 12:38:44 +0200
Subject: [PATCH] Do not use fedora-container-common.ks in
 fedora-eln-container-base.ks

The Fedora ELN container is special in a way that the "%{fedora}"
RPM macro is not defined there. This breaks the Fedora ELN container
build, because fedora-container-common.ks expects this macro to exist.

This commit merges fedora-container-common.ks into
fedora-eln-container-base.ks and hardcodes Fedora 34 GPG key there.

The fedora-eln-container-base.ks will be updated once we move to
newer Fedora.

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
---
 fedora-eln-container-base.ks | 65 +++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/fedora-eln-container-base.ks b/fedora-eln-container-base.ks
index 6a9a544..adab7dc 100644
--- a/fedora-eln-container-base.ks
+++ b/fedora-eln-container-base.ks
@@ -1,9 +1,54 @@
 # 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
 
-%include fedora-container-common.ks
+text
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+# add console and reorder in %post
+bootloader --timeout=1 --location=mbr --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0"
+auth --enableshadow --passalgo=sha512
+selinux --enforcing
+firewall --enabled --service=ssh
+network --bootproto=dhcp --device=link --activate --onboot=on
+#services --enabled=sshd,ovirt-guest-agent --disabled kdump,rhsmcertd
+services --enabled=sshd,NetworkManager,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd --disabled kdump,rhsmcertd
+rootpw --iscrypted nope
+
+#
+# Partition Information. Change this as necessary
+# This information is used by appliance-tools but
+# not by the livecd tools.
+#
+zerombr
+clearpart --all --initlabel
+# autopart --type=plain --nohome # --nohome doesn't work because of rhbz#1509350
+# autopart is problematic in that it creates /boot and swap partitions rhbz#1542510 rhbz#1673094
+reqpart
+part / --fstype="xfs" --ondisk=vda --size=8000
+reboot
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+fedora-release-container
+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
 # https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
 fedora-repos-modular
@@ -49,6 +94,24 @@ rm -rfv /var/cache/* /var/log/* /tmp/*
 %post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.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-34-primary
+
+echo "# fstab intentionally empty for containers" > /etc/fstab
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
 # 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