From b531744921abb62e62d9f1bdcc65a6989ebf63d2 Mon Sep 17 00:00:00 2001
From: Ian McLeod <imcleod@localhost.localdomain>
Date: Tue, 19 Jun 2018 16:39:25 -0500
Subject: [PATCH] Remove several more packages, these inside of arch
 conditionals - that are not in the composes

---
 80-rhel/runtime-install.tmpl | 17 ++++++++++-------
 lorax-templates-rhel.spec    |  5 ++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index 4fc2af0..5263c16 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -42,19 +42,21 @@ installpkg glibc-all-langpacks
     installpkg grub2-tools-efi
     installpkg efibootmgr
     installpkg shim-x64 grub2-efi-x64-cdboot
-    installpkg shim-ia32 grub2-efi-ia32-cdboot
+    ## installpkg shim-ia32 grub2-efi-ia32-cdboot
 %endif
 %if basearch in ("i386", "x86_64"):
     installpkg biosdevname memtest86+ syslinux
     installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
 %endif
 %if basearch in ("ppc", "ppc64", "ppc64le"):
-    installpkg fbset hfsutils powerpc-utils lsvpd ppc64-diag
+    installpkg fbset powerpc-utils lsvpd ppc64-diag
+    # removed hfsutils
     installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
     installpkg grub2-${basearch}
 %endif
 %if basearch == "s390x":
-    installpkg lsscsi s390utils-base s390utils-cmsfs-fuse s390utils-hmcdrvfs
+    installpkg lsscsi s390utils-base s390utils-cmsfs-fuse
+    # removed s390utils-hmcdrvfs
 %endif
 
 ## yay, plymouth
@@ -120,12 +122,13 @@ installpkg nmap-ncat
 installpkg pciutils usbutils ipmitool
 installpkg mt-st smartmontools
 installpkg hdparm
-%if basearch not in ("aarch64", "ppc64le", "s390x"):
-installpkg pcmciautils
-%endif
+#%if basearch not in ("aarch64", "ppc64le", "s390x"):
+#installpkg pcmciautils
+#%endif
 ## see bug #1483278
 %if basearch not in ("arm", "armhfp"):
-    installpkg libmlx4 rdma-core
+    installpkg rdma-core
+    # removed libmlx4
 %endif
 installpkg rng-tools
 
diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index e7dc195..1596ffa 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -1,6 +1,6 @@
 Name:           lorax-templates-rhel
 Version:        8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RHEL8 build templates for lorax and livemedia-creator
 
 License:        GPLv2+
@@ -31,6 +31,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Tue Jun 19 2018 Ian McLeod <imcleod@redhat.com> - 8.0-2
+- Remove several _more_ packages from installer - same reason as below
+
 * Tue Jun 19 2018 Ian McLeod <imcleod@redhat.com> - 8.0-1
 - Remove several packages from installer based on current state of BaseOS/AppStream