From 6cfcbbb5764646de4a0d384d92d2f57cf4a9aff1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Mon, 30 Jun 2014 21:05:57 +0200
Subject: [PATCH] Updating isohdpfx handling for syslinux 6.

---
 scripts/build/binary_iso | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index 9b4d6eae4..1d36924b6 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -55,10 +55,17 @@ Create_lockfile .lock
 # Checking depends
 Check_package chroot/usr/bin/xorriso xorriso
 
-if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
-then
-	Check_package chroot/usr/lib/syslinux/isohdpfx.bin syslinux-common
-fi
+case "${LB_PARENT_DISTRIBUTION}" in
+	wheezy|jessie)
+		_ISOHDPFX="/usr/lib/syslinux/isohdpfx.bin"
+		Check_package chroot/${_ISOHDPFX} syslinux-common
+		;;
+
+	*)
+		_ISOHDPFX="/usr/lib/ISOLINUX/isohdpfx.bin"
+		Check_package chroot/${_ISOHDPFX} isolinux
+		;;
+esac
 
 # Restoring cache
 Restore_cache cache/packages.binary
@@ -78,7 +85,7 @@ XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes"
 # Handle xorriso live-build specific options
 if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
 then
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin -partition_offset 16"
+	XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr ${_ISOHDPFX} -partition_offset 16"
 fi
 
 if [ "${_QUIET}" = "true" ]