From 2f884875d30a45d9d8296ef6080a4d263fb97693 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Fri, 17 Jun 2022 15:36:57 -0400
Subject: [PATCH] Complete dropping of isolinux

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 .gitignore                |  1 +
 80-rhel/x86.tmpl          | 10 ----------
 SERIAL                    |  2 +-
 lorax-templates-rhel.spec |  7 +++++--
 sources                   |  2 +-
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index bc4f766..ec92a96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ clog
 /lorax-templates-rhel-10.0-14.tar.gz
 /lorax-templates-rhel-10.0-15.tar.gz
 /lorax-templates-rhel-10.0-16.tar.gz
+/lorax-templates-rhel-10.0-17.tar.gz
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
index b4af124..07f800b 100644
--- a/80-rhel/x86.tmpl
+++ b/80-rhel/x86.tmpl
@@ -1,11 +1,9 @@
 <%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, product, isolabel"/>
 <%
 configdir="tmp/config_files/x86"
-SYSLINUXDIR="usr/share/syslinux"
 PXEBOOTDIR="images/pxeboot"
 STAGE2IMG="images/install.img"
 GRUB2DIR="boot/grub2"
-BOOTDIR="isolinux"
 KERNELDIR=PXEBOOTDIR
 LORAXDIR="usr/share/lorax/"
 
@@ -30,14 +28,6 @@ mkdir images
 install ${runtime_img} ${STAGE2IMG}
 treeinfo stage2 mainimage images/${runtime_base}
 
-## BIOS setup
-<%
-    biosgraft = "boot=${outroot}/boot"
-    biosgraft += " ${GRUB2DIR}/i386-pc=${inroot}/usr/lib/grub/i386-pc"
-    biosgraft += " images/eltorito.img=${outroot}/images/eltorito.img"
-%>
-treeinfo images-${basearch} eltorito.img images/eltorito.img
-
 ## install kernels
 mkdir ${KERNELDIR}
 %for kernel in kernels:
diff --git a/SERIAL b/SERIAL
index b6a7d89..98d9bcb 100644
--- a/SERIAL
+++ b/SERIAL
@@ -1 +1 @@
-16
+17
diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index 687363c..62b87f5 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -1,6 +1,6 @@
 Name:           lorax-templates-rhel
 Version:        10.0
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        RHEL build templates for lorax and livemedia-creator
 
 License:        GPLv2+
@@ -10,7 +10,7 @@ BuildArch:      noarch
 # This tarball is generated from the contents of this dist-git repository
 # by running the command `make tar`.
 # See README for full details of how to update this package
-Source0:        lorax-templates-rhel-10.0-16.tar.gz
+Source0:        lorax-templates-rhel-10.0-17.tar.gz
 
 # Required for the template branding support
 Requires:       lorax >= 34.9.1
@@ -38,6 +38,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Fri Jun 17 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-17
+- Complete removal of syslinux
+
 * Thu Jun 16 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-16
 - Fix typo
 
diff --git a/sources b/sources
index f82271f..c375b95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-templates-rhel-10.0-16.tar.gz) = e00e2ebbb6ba7a2e81b60e550213f3ab27b673d309ff1cec42d46108a601cf71f379a2acb7936f70405f62fe9c011c1f200572d7304f37e90742ecd657fb9d73
+SHA512 (lorax-templates-rhel-10.0-17.tar.gz) = 2f72bfddc61d9be7499595eb0fe17f8b38077328c91f683f83d075d6b5332422bf1a20ed1b118788bf2d32d229a5a256d16cdae3e2d563d5dcada194f5025321