diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2014-06-30 21:05:57 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2014-06-30 21:05:57 +0200 |
| commit | 6cfcbbb5764646de4a0d384d92d2f57cf4a9aff1 (patch) | |
| tree | e46173ca727d8f7b6b7ad4aac808bf90703fe168 | |
| parent | 802741f84a4e8ef22be3f348e31d2b398ca02c1c (diff) | |
| download | vyos-live-build-6cfcbbb5764646de4a0d384d92d2f57cf4a9aff1.tar.gz vyos-live-build-6cfcbbb5764646de4a0d384d92d2f57cf4a9aff1.zip | |
Updating isohdpfx handling for syslinux 6.
| -rwxr-xr-x | scripts/build/binary_iso | 17 |
1 files 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" ] |