From cd974309fadbcba2b6a7cedd5f92c5f76ab7efa9 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 23 Feb 2022 14:28:13 -0800
Subject: [PATCH 1/2] Restore missing packages

These were commented out early in the RHEL9 Alpha import process and
should be included in the boot.iso

nmap-ncat
redhat-release-eula
libreport-rhel-anaconda-bugzilla

Resolves: rhbz#2056086
---
 80-rhel/runtime-install.tmpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index f40e532..ac3fe06 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -4,7 +4,7 @@
 ## anaconda package
 installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-img-deps
 installpkg oscap-anaconda-addon
-# installpkg redhat-release-eula
+installpkg redhat-release-eula
 
 ## FIXME Pull in device-mapper-multipath
 ## This *should* be pulled in by libblockdev-plugins-all and libblockdev-mpath but it is not
@@ -116,8 +116,7 @@ installpkg ethtool openssh-server nfs-utils openssh-clients
 installpkg tigervnc-server-minimal
 installpkg tigervnc-server-module
 installpkg net-tools
-# TODO: uncomment
-# installpkg nmap-ncat
+installpkg nmap-ncat
 installpkg prefixdevname
 installpkg ipcalc
 
@@ -164,7 +163,7 @@ installpkg google-noto-sans-cjk-ttc-fonts
 ## debugging/bug reporting tools
 installpkg gdb-gdbserver
 installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader
-# installpkg libreport-rhel-anaconda-bugzilla
+installpkg libreport-rhel-anaconda-bugzilla
 installpkg python3-pyatspi
 
 ## extra tools not required by anaconda

From b4555e602e350c28665ceb7f5b853105f389114f Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 24 Feb 2022 11:27:50 -0800
Subject: [PATCH 2/2] - Restore missing packages (bcl)   Resolves: rhbz#2056086

---
 .gitignore                | 1 +
 SERIAL                    | 2 +-
 lorax-templates-rhel.spec | 8 ++++++--
 sources                   | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31a7ef3..59bb09b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@
 /lorax-templates-rhel-9.0-31.tar.gz
 /lorax-templates-rhel-9.0-32.tar.gz
 /lorax-templates-rhel-9.0-33.tar.gz
+/lorax-templates-rhel-9.0-34.tar.gz
diff --git a/SERIAL b/SERIAL
index bb95160..a787364 100644
--- a/SERIAL
+++ b/SERIAL
@@ -1 +1 @@
-33
+34
diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index a1ca547..b6cb135 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -1,12 +1,12 @@
 Name:           lorax-templates-rhel
 Version:        9.0
-Release:        33%{?dist}
+Release:        34%{?dist}
 Summary:        RHEL8 build templates for lorax and livemedia-creator
 
 License:        GPLv2+
 URL:            https://github.com/weldr/lorax
 BuildArch:      noarch
-Source0:        lorax-templates-rhel-9.0-33.tar.gz
+Source0:        lorax-templates-rhel-9.0-34.tar.gz
 
 # Required for the template branding support
 Requires:       lorax >= 34.9.1
@@ -34,6 +34,10 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Thu Feb 24 2022 Brian C. Lane <bcl@redhat.com> - 9.0-34
+- Restore missing packages (bcl)
+  Resolves: rhbz#2056086
+
 * Fri Feb 04 2022 Brian C. Lane <bcl@redhat.com> - 9.0-33
 - Keep nvram kernel module (bcl)
   Resolves: rhbz#2050878
diff --git a/sources b/sources
index 418e738..8ab6e66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-templates-rhel-9.0-33.tar.gz) = ef56250cb97e6d82faeb534b24857b1fcc55a906eef0fee64319a0607e09e24596dfe972156482d465cd1aea3e53454a9a1901cf1aba6810ecd02f849ec5ef43
+SHA512 (lorax-templates-rhel-9.0-34.tar.gz) = b4f41df4e01d9223e336080caa0b064368d3a086a0a3293a63c2ca9e4caf6d80b9913f785ab8f2cb2122fda056ae93a0cb02e52ab16357d025908e68a035bb90