From a8c3556bc4c9a386439e5b1453c6f41cecd18a2c Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Mon, 4 Jul 2022 17:41:15 -0400
Subject: [PATCH] Fixup deprecations in kickstarts

---
 Rocky-9-Container-Base.ks    | 7 ++++---
 Rocky-9-Container-Minimal.ks | 6 +++---
 Rocky-9-Vagrant-Libvirt.ks   | 2 +-
 Rocky-9-Vagrant-Vbox.ks      | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Rocky-9-Container-Base.ks b/Rocky-9-Container-Base.ks
index ce19054..e43cbcd 100644
--- a/Rocky-9-Container-Base.ks
+++ b/Rocky-9-Container-Base.ks
@@ -14,7 +14,7 @@ shutdown
 
 keyboard us
 lang en_US.UTF-8
-timezone --isUtc --nontp UTC
+timezone --isUtc --ntp-disable UTC
 
 # Disk setup
 zerombr
@@ -22,7 +22,7 @@ clearpart --all --initlabel
 autopart --noboot --nohome --noswap --nolvm --fstype=ext4
 
 # Package setup
-%packages --ignoremissing --excludedocs --instLangs=en --nocore --excludeWeakdeps
+%packages --ignoremissing --excludedocs --inst-langs=en --nocore --exclude-weakdeps
 bash
 binutils
 coreutils-single
@@ -91,6 +91,7 @@ systemctl mask \
 rm -f /etc/udev/hwdb.bin
 rm -rf /usr/lib/udev/hwdb.d/ \
        /boot /var/lib/dnf/history.* \
-       /tmp/* /tmp/.* || true
+       "/tmp/*" "/tmp/.*" || true
+
 
 %end
diff --git a/Rocky-9-Container-Minimal.ks b/Rocky-9-Container-Minimal.ks
index f0a50cb..ee5e0e6 100644
--- a/Rocky-9-Container-Minimal.ks
+++ b/Rocky-9-Container-Minimal.ks
@@ -13,7 +13,7 @@ shutdown
 
 keyboard us
 lang en_US.UTF-8
-timezone --isUtc --nontp UTC
+timezone --isUtc --ntp-disable UTC
 
 # Disk setup
 zerombr
@@ -21,7 +21,7 @@ clearpart --all --initlabel
 autopart --noboot --nohome --noswap --nolvm --fstype=ext4
 
 # Package setup
-%packages --ignoremissing --excludedocs --instLangs=en --nocore --excludeWeakdeps
+%packages --ignoremissing --excludedocs --inst-langs=en --nocore --exclude-weakdeps
 bash
 coreutils-single
 glibc-minimal-langpack
@@ -92,6 +92,6 @@ systemctl mask \
 rm -f /etc/udev/hwdb.bin
 rm -rf /usr/lib/udev/hwdb.d/ \
        /boot /var/lib/dnf/history.* \
-       /tmp/* /tmp/.* 
+      "/tmp/*" "/tmp/.*" || true
 
 %end
diff --git a/Rocky-9-Vagrant-Libvirt.ks b/Rocky-9-Vagrant-Libvirt.ks
index 058c195..21c1d19 100644
--- a/Rocky-9-Vagrant-Libvirt.ks
+++ b/Rocky-9-Vagrant-Libvirt.ks
@@ -18,7 +18,7 @@ user --name=vagrant --plaintext --password=vagrant
 
 shutdown
 
-%packages --instLangs=en
+%packages --inst-langs=en
 bash-completion
 man-pages
 bzip2
diff --git a/Rocky-9-Vagrant-Vbox.ks b/Rocky-9-Vagrant-Vbox.ks
index 4a1be0b..fbf1442 100644
--- a/Rocky-9-Vagrant-Vbox.ks
+++ b/Rocky-9-Vagrant-Vbox.ks
@@ -18,7 +18,7 @@ user --name=vagrant --plaintext --password=vagrant
 
 reboot
 
-%packages --instLangs=en
+%packages --inst-langs=en
 bash-completion
 man-pages
 bzip2