From f7930e11e7a5246675ac56f4da4ea6aa61b4341b Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 11 Jan 2022 10:11:03 -0800
Subject: [PATCH 01/11] Enable sftp when using inst.sshd

scp in openssh 8.7 will change to use sftp protocol. See
https://github.com/openssh/openssh-portable/pull/194 for details.

This enables the sshd internal-sftp implementation so that newer scp
versions will continue to work as expected. Note that the sshd service
is only running during the installation if inst.sshd is passed on the
kernel cmdline.

Resolves: rhbz#2035049
---
 80-rhel/config_files/common/sshd_config.anaconda | 1 +
 1 file changed, 1 insertion(+)

diff --git a/80-rhel/config_files/common/sshd_config.anaconda b/80-rhel/config_files/common/sshd_config.anaconda
index e6d4644..940f501 100644
--- a/80-rhel/config_files/common/sshd_config.anaconda
+++ b/80-rhel/config_files/common/sshd_config.anaconda
@@ -6,3 +6,4 @@ SyslogFacility AUTHPRIV
 PasswordAuthentication yes
 PermitEmptyPasswords yes
 PermitUserEnvironment yes
+Subsystem sftp internal-sftp

From 35896636df415824beccd56a12b5f1c328430d7c Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 11 Jan 2022 10:18:13 -0800
Subject: [PATCH 02/11] Drop ia32 uefi package installation

32bit uefi installations are not supported.

Resolves: rhbz#2038397
---
 80-rhel/live/live-install.tmpl | 1 -
 80-rhel/runtime-install.tmpl   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/80-rhel/live/live-install.tmpl b/80-rhel/live/live-install.tmpl
index d1acbdb..3669e38 100644
--- a/80-rhel/live/live-install.tmpl
+++ b/80-rhel/live/live-install.tmpl
@@ -15,7 +15,6 @@
     installpkg grub2-tools-efi
     installpkg efibootmgr
     installpkg shim-x64 grub2-efi-x64-cdboot
-    installpkg shim-ia32 grub2-efi-ia32-cdboot
 %endif
 %if basearch in ("i386", "x86_64"):
     installpkg biosdevname memtest86+ syslinux
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index b161c04..143d81e 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -43,7 +43,6 @@ installpkg glibc-all-langpacks
     installpkg grub2-tools-efi
     installpkg efibootmgr
     installpkg shim-x64 grub2-efi-x64-cdboot
-    installpkg shim-ia32 grub2-efi-ia32-cdboot
 %endif
 %if basearch in ("i386", "x86_64"):
     installpkg biosdevname memtest86+ syslinux

From 7cdff9d315f5106bf865a00143f6294a764d3aae Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 11 Jan 2022 11:46:27 -0800
Subject: [PATCH 03/11] - Drop ia32 uefi package installation (bcl)   Resolves:
 rhbz#2038397 - Enable sftp when using inst.sshd (bcl)   Resolves:
 rhbz#2035049

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

diff --git a/.gitignore b/.gitignore
index 964e81b..e8e7744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
 /lorax-templates-rhel-9.0-26.tar.gz
 /lorax-templates-rhel-9.0-27.tar.gz
 /lorax-templates-rhel-9.0-28.tar.gz
+/lorax-templates-rhel-9.0-29.tar.gz
diff --git a/SERIAL b/SERIAL
index 9902f17..f04c001 100644
--- a/SERIAL
+++ b/SERIAL
@@ -1 +1 @@
-28
+29
diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index 49d0afa..976ea0c 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -1,12 +1,12 @@
 Name:           lorax-templates-rhel
 Version:        9.0
-Release:        28%{?dist}
+Release:        29%{?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-28.tar.gz
+Source0:        lorax-templates-rhel-9.0-29.tar.gz
 
 # Required for the template branding support
 Requires:       lorax >= 34.9.1
@@ -34,6 +34,12 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Tue Jan 11 2022 Brian C. Lane <bcl@redhat.com> - 9.0-29
+- Drop ia32 uefi package installation (bcl)
+  Resolves: rhbz#2038397
+- Enable sftp when using inst.sshd (bcl)
+  Resolves: rhbz#2035049
+
 * Mon Nov 01 2021 Brian C. Lane <bcl@redhat.com> - 9.0-28
 - Drop ppc 32 bit support from grub template for live iso (bcl)
   Resolves: rhbz#2017175
diff --git a/sources b/sources
index d55b8f1..f424aa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-templates-rhel-9.0-28.tar.gz) = 667c5726ec99c9b2be905dd68f6c78f8838b58512e77741923daf753556bd8d3a28ef120709d37fee3ca8a5645f5a64e4b29ed56f2da8c0cc2cf13ed2c2fb13d
+SHA512 (lorax-templates-rhel-9.0-29.tar.gz) = abaabb47bfe2289b55310ade803edad18fa24c0f1e1de4d823e3a5711b30145f2df90f5ff4ae859b7cf6202457166b8c9d460bee9505facb07105ccc336179f8

From 09acfd978e2bf0b94be343d45172a5d2d776aedb Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Fri, 17 Dec 2021 13:16:34 -0800
Subject: [PATCH 04/11] Add inst.rngd cmdline option

rngd should no long be needed, recent kernels have enough entropy out of
the box. This leaves it in the boot.iso but only enables it if inst.rngd
is passed on the kernel cmdline.

Resolves: rhbz#2028720
---
 80-rhel/config_files/common/inst.rngd.service | 11 +++++++++++
 80-rhel/runtime-postinstall.tmpl              | 10 ++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 80-rhel/config_files/common/inst.rngd.service

diff --git a/80-rhel/config_files/common/inst.rngd.service b/80-rhel/config_files/common/inst.rngd.service
new file mode 100644
index 0000000..7b51033
--- /dev/null
+++ b/80-rhel/config_files/common/inst.rngd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Hardware RNG Entropy Gatherer Daemon
+ConditionVirtualization=!container
+ConditionKernelCommandLine=|inst.rngd
+ConditionKernelCommandLine=!inst.rngd=0
+
+# The "-f" option is required for the systemd service rngd to work with Type=simple
+[Service]
+Type=simple
+EnvironmentFile=/etc/sysconfig/rngd
+ExecStart=/usr/sbin/rngd -f $RNGD_ARGS
diff --git a/80-rhel/runtime-postinstall.tmpl b/80-rhel/runtime-postinstall.tmpl
index 0e573ec..5aa9518 100644
--- a/80-rhel/runtime-postinstall.tmpl
+++ b/80-rhel/runtime-postinstall.tmpl
@@ -28,10 +28,6 @@ symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target
 mkdir etc/systemd/system/local-fs.target.wants/
 symlink /lib/systemd/system/tmp.mount etc/systemd/system/local-fs.target.wants/tmp.mount
 
-## Start rngd
-mkdir etc/systemd/system/basic.target.wants/
-symlink /lib/systemd/system/rngd.service etc/systemd/system/basic.target.wants/rngd.service
-
 ## Disable unwanted systemd services
 systemctl disable systemd-readahead-collect.service \
                   systemd-readahead-replay.service \
@@ -46,6 +42,7 @@ systemctl mask fedora-configure.service fedora-loadmodules.service \
                fedora-wait-storage.service media.mount \
                systemd-tmpfiles-clean.service systemd-tmpfiles-clean.timer \
                ldconfig.service
+remove usr/lib/systemd/system/rngd.service
 
 ## remove because it cannot be disabled
 remove usr/lib/systemd/system-generators/lvm2-activation-generator
@@ -83,6 +80,11 @@ install ${configdir}/pam.sshd etc/pam.d/sshd
 install ${configdir}/pam.sshd etc/pam.d/login
 install ${configdir}/pam.sshd etc/pam.d/remote
 
+## set up inst.rngd support
+install ${configdir}/inst.rngd.service etc/systemd/system/inst.rngd.service
+mkdir etc/systemd/system/basic.target.wants/
+symlink /etc/systemd/system/inst.rngd.service etc/systemd/system/basic.target.wants/inst.rngd.service
+
 ## set up "install" user account
 append etc/passwd "install:x:0:0:root:/root:/usr/libexec/anaconda/run-anaconda"
 append etc/shadow "install::14438:0:99999:7:::"

From 7f8955e9abf01c3e97e7df549e39e0e200cfd1e6 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 12 Jan 2022 11:25:48 -0800
Subject: [PATCH 05/11] Add .discinfo on all arches

It was previously added to s390x and ppc64le, this adds it for aarch64,
ppc, and x86 images.

Resolves: rhbz#2030008
---
 80-rhel/aarch64.tmpl | 1 +
 80-rhel/ppc.tmpl     | 1 +
 80-rhel/x86.tmpl     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/80-rhel/aarch64.tmpl b/80-rhel/aarch64.tmpl
index 600055c..2893a50 100644
--- a/80-rhel/aarch64.tmpl
+++ b/80-rhel/aarch64.tmpl
@@ -78,6 +78,7 @@ mkdir ${KERNELDIR}
 runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \
        ${efiargs} -R -J -V '${isolabel}' \
        -graft-points \
+       .discinfo=${outroot}/.discinfo \
        ${KERNELDIR}=${outroot}/${KERNELDIR} \
        ${STAGE2IMG}=${outroot}/${STAGE2IMG} \
        ${efigraft} ${filegraft}
diff --git a/80-rhel/ppc.tmpl b/80-rhel/ppc.tmpl
index 2faf364..b86d020 100644
--- a/80-rhel/ppc.tmpl
+++ b/80-rhel/ppc.tmpl
@@ -107,6 +107,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \
         -hfs-volid ${product.version} -hfs-bless ${outroot}/${MACDIR} \
         -map ${inroot}/${configdir}/mapping \
         -no-desktop -allow-multidot ${udfargs} -graft-points \
+        .discinfo=${outroot}/.discinfo \
         ${BOOTDIR}=${outroot}/${BOOTDIR} \
         ${GRUBDIR}=${outroot}/${GRUBDIR} \
         ${STAGE2IMG}=${outroot}/${STAGE2IMG} ${filegraft}
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
index 4bfc1bf..3d9d0a4 100644
--- a/80-rhel/x86.tmpl
+++ b/80-rhel/x86.tmpl
@@ -127,6 +127,7 @@ runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \
        -boot-load-size 4 -boot-info-table -no-emul-boot \
        ${efiargs} -R -J -V '${isolabel}' \
        -graft-points \
+       .discinfo=${outroot}/.discinfo \
        ${STAGE2IMG}=${outroot}/${STAGE2IMG} \
        ${BOOTDIR}=${outroot}/${BOOTDIR} \
        ${KERNELDIR}=${outroot}/${KERNELDIR} \

From 2b2920673d1cda4d29a5f454bcdd58fbe5700e9b Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 12 Jan 2022 11:47:43 -0800
Subject: [PATCH 06/11] - Add .discinfo on all arches (bcl)   Resolves:
 rhbz#2030008 - Add inst.rngd cmdline option (bcl)   Resolves: rhbz#2028720

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

diff --git a/.gitignore b/.gitignore
index e8e7744..a30fc5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
 /lorax-templates-rhel-9.0-27.tar.gz
 /lorax-templates-rhel-9.0-28.tar.gz
 /lorax-templates-rhel-9.0-29.tar.gz
+/lorax-templates-rhel-9.0-30.tar.gz
diff --git a/SERIAL b/SERIAL
index f04c001..64bb6b7 100644
--- a/SERIAL
+++ b/SERIAL
@@ -1 +1 @@
-29
+30
diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index 976ea0c..fc712cc 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -1,12 +1,12 @@
 Name:           lorax-templates-rhel
 Version:        9.0
-Release:        29%{?dist}
+Release:        30%{?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-29.tar.gz
+Source0:        lorax-templates-rhel-9.0-30.tar.gz
 
 # Required for the template branding support
 Requires:       lorax >= 34.9.1
@@ -34,6 +34,12 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Wed Jan 12 2022 Brian C. Lane <bcl@redhat.com> - 9.0-30
+- Add .discinfo on all arches (bcl)
+  Resolves: rhbz#2030008
+- Add inst.rngd cmdline option (bcl)
+  Resolves: rhbz#2028720
+
 * Tue Jan 11 2022 Brian C. Lane <bcl@redhat.com> - 9.0-29
 - Drop ia32 uefi package installation (bcl)
   Resolves: rhbz#2038397
diff --git a/sources b/sources
index f424aa3..124ff83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-templates-rhel-9.0-29.tar.gz) = abaabb47bfe2289b55310ade803edad18fa24c0f1e1de4d823e3a5711b30145f2df90f5ff4ae859b7cf6202457166b8c9d460bee9505facb07105ccc336179f8
+SHA512 (lorax-templates-rhel-9.0-30.tar.gz) = 105db7cda745b4178018fd5bef392b44e0da82d55b2c97e6c28bc47d4c7e610409bb8926df7b9ed97955ead15e939c120a4d817c1d13a887cd2825714566e39c

From b403f2d7746e88f04d47cbe6c602a14526d04453 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 13 Jan 2022 10:43:27 -0800
Subject: [PATCH 07/11] Revert "Add inst.rngd cmdline option"

This reverts commit 09acfd978e2bf0b94be343d45172a5d2d776aedb.

rngd is installed in the initrd by dracut, and unconditionally started,
so this won't fix rngd slowdowns in the initrd.

Related: rhbz#2028720
---
 80-rhel/config_files/common/inst.rngd.service | 11 -----------
 80-rhel/runtime-postinstall.tmpl              | 10 ++++------
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 80-rhel/config_files/common/inst.rngd.service

diff --git a/80-rhel/config_files/common/inst.rngd.service b/80-rhel/config_files/common/inst.rngd.service
deleted file mode 100644
index 7b51033..0000000
--- a/80-rhel/config_files/common/inst.rngd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Hardware RNG Entropy Gatherer Daemon
-ConditionVirtualization=!container
-ConditionKernelCommandLine=|inst.rngd
-ConditionKernelCommandLine=!inst.rngd=0
-
-# The "-f" option is required for the systemd service rngd to work with Type=simple
-[Service]
-Type=simple
-EnvironmentFile=/etc/sysconfig/rngd
-ExecStart=/usr/sbin/rngd -f $RNGD_ARGS
diff --git a/80-rhel/runtime-postinstall.tmpl b/80-rhel/runtime-postinstall.tmpl
index 5aa9518..0e573ec 100644
--- a/80-rhel/runtime-postinstall.tmpl
+++ b/80-rhel/runtime-postinstall.tmpl
@@ -28,6 +28,10 @@ symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target
 mkdir etc/systemd/system/local-fs.target.wants/
 symlink /lib/systemd/system/tmp.mount etc/systemd/system/local-fs.target.wants/tmp.mount
 
+## Start rngd
+mkdir etc/systemd/system/basic.target.wants/
+symlink /lib/systemd/system/rngd.service etc/systemd/system/basic.target.wants/rngd.service
+
 ## Disable unwanted systemd services
 systemctl disable systemd-readahead-collect.service \
                   systemd-readahead-replay.service \
@@ -42,7 +46,6 @@ systemctl mask fedora-configure.service fedora-loadmodules.service \
                fedora-wait-storage.service media.mount \
                systemd-tmpfiles-clean.service systemd-tmpfiles-clean.timer \
                ldconfig.service
-remove usr/lib/systemd/system/rngd.service
 
 ## remove because it cannot be disabled
 remove usr/lib/systemd/system-generators/lvm2-activation-generator
@@ -80,11 +83,6 @@ install ${configdir}/pam.sshd etc/pam.d/sshd
 install ${configdir}/pam.sshd etc/pam.d/login
 install ${configdir}/pam.sshd etc/pam.d/remote
 
-## set up inst.rngd support
-install ${configdir}/inst.rngd.service etc/systemd/system/inst.rngd.service
-mkdir etc/systemd/system/basic.target.wants/
-symlink /etc/systemd/system/inst.rngd.service etc/systemd/system/basic.target.wants/inst.rngd.service
-
 ## set up "install" user account
 append etc/passwd "install:x:0:0:root:/root:/usr/libexec/anaconda/run-anaconda"
 append etc/shadow "install::14438:0:99999:7:::"

From 849a2b9a20fc362274d46912421eeeb23934e8ae Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 13 Jan 2022 10:45:26 -0800
Subject: [PATCH 08/11] Do not install rng-tools

Running rngd can slow down the boot in some situations. All current
arches in RHEL support better entropy gathering so this is no longer
needed.

Resolves: rhbz#2028720
---
 80-rhel/runtime-install.tmpl     | 1 -
 80-rhel/runtime-postinstall.tmpl | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index 143d81e..f40e532 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -128,7 +128,6 @@ installpkg hdparm
 %if basearch not in ("arm", "armhfp"):
     installpkg libmlx4 rdma-core
 %endif
-installpkg rng-tools
 %if basearch in ("i386", "x86_64", "aarch64"):
 installpkg dmidecode
 %endif
diff --git a/80-rhel/runtime-postinstall.tmpl b/80-rhel/runtime-postinstall.tmpl
index 0e573ec..ddcf8b9 100644
--- a/80-rhel/runtime-postinstall.tmpl
+++ b/80-rhel/runtime-postinstall.tmpl
@@ -28,10 +28,6 @@ symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target
 mkdir etc/systemd/system/local-fs.target.wants/
 symlink /lib/systemd/system/tmp.mount etc/systemd/system/local-fs.target.wants/tmp.mount
 
-## Start rngd
-mkdir etc/systemd/system/basic.target.wants/
-symlink /lib/systemd/system/rngd.service etc/systemd/system/basic.target.wants/rngd.service
-
 ## Disable unwanted systemd services
 systemctl disable systemd-readahead-collect.service \
                   systemd-readahead-replay.service \

From 1872fdc5752291913c2d6d6ee226738fd63e1f8d Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 13 Jan 2022 11:45:52 -0800
Subject: [PATCH 09/11] - Do not install rng-tools (bcl)   Resolves:
 rhbz#2028720 - Revert "Add inst.rngd cmdline option" (bcl)   Related:
 rhbz#2028720

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

diff --git a/.gitignore b/.gitignore
index a30fc5f..d301c4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@
 /lorax-templates-rhel-9.0-28.tar.gz
 /lorax-templates-rhel-9.0-29.tar.gz
 /lorax-templates-rhel-9.0-30.tar.gz
+/lorax-templates-rhel-9.0-31.tar.gz
diff --git a/SERIAL b/SERIAL
index 64bb6b7..e85087a 100644
--- a/SERIAL
+++ b/SERIAL
@@ -1 +1 @@
-30
+31
diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index fc712cc..f39fbdd 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -1,12 +1,12 @@
 Name:           lorax-templates-rhel
 Version:        9.0
-Release:        30%{?dist}
+Release:        31%{?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-30.tar.gz
+Source0:        lorax-templates-rhel-9.0-31.tar.gz
 
 # Required for the template branding support
 Requires:       lorax >= 34.9.1
@@ -34,6 +34,12 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Thu Jan 13 2022 Brian C. Lane <bcl@redhat.com> - 9.0-31
+- Do not install rng-tools (bcl)
+  Resolves: rhbz#2028720
+- Revert "Add inst.rngd cmdline option" (bcl)
+  Related: rhbz#2028720
+
 * Wed Jan 12 2022 Brian C. Lane <bcl@redhat.com> - 9.0-30
 - Add .discinfo on all arches (bcl)
   Resolves: rhbz#2030008
diff --git a/sources b/sources
index 124ff83..077f51f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-templates-rhel-9.0-30.tar.gz) = 105db7cda745b4178018fd5bef392b44e0da82d55b2c97e6c28bc47d4c7e610409bb8926df7b9ed97955ead15e939c120a4d817c1d13a887cd2825714566e39c
+SHA512 (lorax-templates-rhel-9.0-31.tar.gz) = 99da113608ca3820e8025f71a0a1b0e80504cacefd1feae93b1c0181c15df4d9518e5eecedc37cdad55786a77450bcbf869f347be9b97c1498b19afb51719235

From 5fdb8a4ba7d39082c221b2a4fc8b4a7e0648becd Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 25 Jan 2022 09:25:39 -0800
Subject: [PATCH 10/11] Fix missing generic.ins on s390x

commit 0c4e1955ee689555bb2740d157638d14572854ef accidentally dropped the
generic.ins file from the iso. This restores that graft point to the
xorrisofs call.

Resolves: rhbz#2044448
---
 80-rhel/s390.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/80-rhel/s390.tmpl b/80-rhel/s390.tmpl
index 731dcd9..bf1d258 100644
--- a/80-rhel/s390.tmpl
+++ b/80-rhel/s390.tmpl
@@ -83,6 +83,7 @@ runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \
        -boot-load-size 4 -no-emul-boot \
        -R -J -V '${isolabel}' -graft-points \
        .discinfo=${outroot}/.discinfo \
+       generic.ins=${outroot}/generic.ins \
        ${BOOTDIR}=${outroot}/${BOOTDIR} \
        ${filegraft}
 treeinfo images-${basearch} boot.iso images/boot.iso

From 362ac9f96160b609d0247dda4fc5dbf6f4aaa565 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 25 Jan 2022 09:29:28 -0800
Subject: [PATCH 11/11] - Fix missing generic.ins on s390x (bcl)   Resolves:
 rhbz#2044448

---
 .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 d301c4b..012ce34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@
 /lorax-templates-rhel-9.0-29.tar.gz
 /lorax-templates-rhel-9.0-30.tar.gz
 /lorax-templates-rhel-9.0-31.tar.gz
+/lorax-templates-rhel-9.0-32.tar.gz
diff --git a/SERIAL b/SERIAL
index e85087a..f5c8955 100644
--- a/SERIAL
+++ b/SERIAL
@@ -1 +1 @@
-31
+32
diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index f39fbdd..73c145d 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -1,12 +1,12 @@
 Name:           lorax-templates-rhel
 Version:        9.0
-Release:        31%{?dist}
+Release:        32%{?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-31.tar.gz
+Source0:        lorax-templates-rhel-9.0-32.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
+* Tue Jan 25 2022 Brian C. Lane <bcl@redhat.com> - 9.0-32
+- Fix missing generic.ins on s390x (bcl)
+  Resolves: rhbz#2044448
+
 * Thu Jan 13 2022 Brian C. Lane <bcl@redhat.com> - 9.0-31
 - Do not install rng-tools (bcl)
   Resolves: rhbz#2028720
diff --git a/sources b/sources
index 077f51f..cff7fd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-templates-rhel-9.0-31.tar.gz) = 99da113608ca3820e8025f71a0a1b0e80504cacefd1feae93b1c0181c15df4d9518e5eecedc37cdad55786a77450bcbf869f347be9b97c1498b19afb51719235
+SHA512 (lorax-templates-rhel-9.0-32.tar.gz) = 52b5b55c696ca52a42af1ea045ecc59f889ad188581b803f8562154ebc40d9809f1b8b8aa3bbee0c8efaa36c1fa44701d70e806ece1b9aa9bf1e43cdf48412b4