From 8f94155830c1a786015f99e46cc4be405af902b4 Mon Sep 17 00:00:00 2001
From: Brian Stinson <bstinson@centosproject.org>
Date: Jan 11 2020 04:12:59 +0000
Subject: Bring Stream kickstarts in line with changes from Linux kickstarts


---

diff --git a/CentOS-8-Stream-EC2.ks b/CentOS-8-Stream-EC2.ks
index 7f6c1ce..8cd0d58 100644
--- a/CentOS-8-Stream-EC2.ks
+++ b/CentOS-8-Stream-EC2.ks
@@ -46,12 +46,12 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
-yum -C -y remove linux-firmware
+dnf -C -y remove linux-firmware
 
 # Remove firewalld; it is required to be present for install/image building.
 # but we dont ship it in cloud
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-yum -C -y remove avahi\* 
+dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+dnf -C -y remove avahi\* 
 sed -i '/^#NAutoVTs=.*/ a\
 NAutoVTs=0' /etc/systemd/logind.conf
 
@@ -103,7 +103,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
 # centos cloud user
 echo -e 'centos\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
-sed -i 's/name: cloud-user/name: centos/g' /etc/cloud/cloud.cfgecho -e 'cloud-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
+sed -i 's/name: cloud-user/name: centos/g' /etc/cloud/cloud.cfg
 
 dnf clean all
 
@@ -133,11 +133,13 @@ echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
 mkdir -p /var/cache/yum
-/usr/sbin/fixfiles -R -a restore ||:
+/usr/sbin/fixfiles -R -a restore
 
 # reorder console entries
 sed -i 's/console=tty0/console=tty0 console=ttyS0,115200n8/' /boot/grub2/grub.cfg
 
+true
+
 %end
 
 %packages
@@ -157,6 +159,7 @@ nfs-utils
 rsync
 tar
 dnf-utils
+yum-utils
 -aic94xx-firmware
 -alsa-firmware
 -alsa-lib
@@ -187,7 +190,6 @@ dnf-utils
 
 python3-jsonschema
 qemu-guest-agent
-firewalld
 dhcp-client
 cockpit-ws
 cockpit-system
diff --git a/CentOS-8-Stream-GenericCloud.ks b/CentOS-8-Stream-GenericCloud.ks
index 96345f7..f273564 100644
--- a/CentOS-8-Stream-GenericCloud.ks
+++ b/CentOS-8-Stream-GenericCloud.ks
@@ -46,12 +46,12 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
-yum -C -y remove linux-firmware
+dnf -C -y remove linux-firmware
 
 # Remove firewalld; it is required to be present for install/image building.
 # but we dont ship it in cloud
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-yum -C -y remove avahi\* 
+dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+dnf -C -y remove avahi\* 
 sed -i '/^#NAutoVTs=.*/ a\
 NAutoVTs=0' /etc/systemd/logind.conf
 
@@ -103,7 +103,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
 # centos cloud user
 echo -e 'centos\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
-sed -i 's/name: cloud-user/name: centos/g' /etc/cloud/cloud.cfgecho -e 'cloud-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
+sed -i 's/name: cloud-user/name: centos/g' /etc/cloud/cloud.cfg
 
 dnf clean all
 
@@ -138,6 +138,8 @@ mkdir -p /var/cache/yum
 # reorder console entries
 sed -i 's/console=tty0/console=tty0 console=ttyS0,115200n8/' /boot/grub2/grub.cfg
 
+true
+
 %end
 
 %packages
@@ -157,6 +159,7 @@ nfs-utils
 rsync
 tar
 dnf-utils
+yum-utils
 -aic94xx-firmware
 -alsa-firmware
 -alsa-lib
@@ -187,7 +190,6 @@ dnf-utils
 
 python3-jsonschema
 qemu-guest-agent
-firewalld
 dhcp-client
 cockpit-ws
 cockpit-system