From d84cb0479d6a9c5a17c2b07a11199544ff87c6db Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Thu, 26 Jul 2018 09:22:48 -0700
Subject: [PATCH] Update runtime-install.tmpl for easier RHEL8 scripting -
 Comment out packages/sections that are not in RHEL8 - Expand variables and
 wildcards

---
 80-rhel/runtime-install.tmpl | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index bb1d125..259a8da 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -31,13 +31,15 @@ installpkg glibc-all-langpacks
 %if basearch == "aarch64":
     installpkg efibootmgr grub2-efi-aa64-cdboot grubby shim-aa64
 %endif
-%if basearch in ("arm", "armhfp"):
-    installpkg kernel-lpae
-    installpkg uboot-tools
-%endif
-%if basearch == "i386":
-    installpkg gpart
-%endif
+# Not in RHEL8 Beta 26-Jul-2018
+#%if basearch in ("arm", "armhfp"):
+#    installpkg kernel-lpae
+#    installpkg uboot-tools
+#%endif
+# Not in RHEL8 Beta 26-Jul-2018
+#%if basearch == "i386":
+#    installpkg gpart
+#%endif
 %if basearch == "x86_64":
     installpkg grub2-tools-efi
     installpkg efibootmgr
@@ -54,7 +56,9 @@ installpkg glibc-all-langpacks
     # Not in RHEL8 Beta 19-Jun-2018
     # removed hfsutils
     installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
-    installpkg grub2-${basearch}
+    # We only have ppc64le in RHEL8 26-Jul-2018
+    #installpkg grub2-${basearch}
+    installpkg grub2-ppc64le
 %endif
 %if basearch == "s390x":
     installpkg lsscsi s390utils-base s390utils-cmsfs-fuse
@@ -83,7 +87,9 @@ installpkg kbd kbd-misc
 installpkg tar xz curl bzip2
 
 ## basic system stuff
-installpkg systemd-sysv systemd-units
+# systemd-sysv systemd-units are now in systemd 26-Jul-2018
+#installpkg systemd-sysv systemd-units
+installpkg systemd
 installpkg rsyslog
 
 ## xorg/GUI packages
@@ -153,13 +159,18 @@ installpkg lklug-fonts
 installpkg lohit-assamese-fonts
 installpkg lohit-bengali-fonts
 installpkg lohit-devanagari-fonts
-installpkg lohit-gu*-fonts
+# expanding lohit-gu*-fonts 26-Jul-2018
+#installpkg lohit-gu*-fonts
+installpkg lohit-gujarati-fonts
+installpkg lohit-gurmukhi-fonts
 installpkg lohit-kannada-fonts
 installpkg lohit-odia-fonts
 installpkg lohit-tamil-fonts
 installpkg lohit-telugu-fonts
 installpkg madan-fonts
-installpkg nhn-nanum-gothic-fonts
+# nhn-nanum-gothic-fonts is now naver-nanum-gothic-fonts 26-Jul-2018
+#installpkg nhn-nanum-gothic-fonts
+installpkg naver-nanum-gothic-fonts
 installpkg smc-meera-fonts
 installpkg thai-scalable-waree-fonts
 installpkg vlgothic-fonts