From e38e17259d1010f20f6f35f133fadd2f90fead1c Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 10 Apr 2014 13:50:25 -0700
Subject: [PATCH] Update to support syslinux 6.02

---
 share/runtime-install.tmpl | 2 +-
 share/x86.tmpl             | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 0150532e..26981061 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -32,7 +32,7 @@ installpkg grubby
     installpkg efibootmgr grub2-efi shim shim-unsigned
 %endif
 %if basearch in ("i386", "x86_64"):
-    installpkg grub2 grub2-tools biosdevname memtest86+ syslinux
+    installpkg grub2 grub2-tools biosdevname memtest86+ syslinux syslinux-nonlinux.i686
 %endif
 %if basearch in ("ppc", "ppc64", "ppc64le"):
     installpkg grub2 grub2-tools fbset hfsutils kernel-bootwrapper ppc64-utils
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 82c0ed84..a139596f 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -16,6 +16,9 @@ treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
 mkdir ${BOOTDIR}
 install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR}
 install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR}
+install ${SYSLINUXDIR}/ldlinux.c32 ${BOOTDIR}
+install ${SYSLINUXDIR}/libcom32.c32 ${BOOTDIR}
+install ${SYSLINUXDIR}/libutil.c32 ${BOOTDIR}
 install ${configdir}/isolinux.cfg ${BOOTDIR}
 install ${configdir}/boot.msg ${BOOTDIR}
 install ${configdir}/grub.conf ${BOOTDIR}