summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-07-22 19:01:56 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2014-07-22 20:11:56 +0200
commit1606ed3c5a1629f73b77cc8c655a1a73829bf913 (patch)
tree0476763b49b63a8a5748fd454bbb2e0291bbf1c0 /scripts/build
parent951e7b44e46c975e3719a400ca9634e32642505f (diff)
downloadvyos-live-build-1606ed3c5a1629f73b77cc8c655a1a73829bf913.tar.gz
vyos-live-build-1606ed3c5a1629f73b77cc8c655a1a73829bf913.zip
Enabling syslinux 6 support for jessie as well.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/binary_iso2
-rwxr-xr-xscripts/build/binary_syslinux4
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index 1d36924b6..7abfc697a 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -56,7 +56,7 @@ Create_lockfile .lock
Check_package chroot/usr/bin/xorriso xorriso
case "${LB_PARENT_DISTRIBUTION}" in
- wheezy|jessie)
+ wheezy)
_ISOHDPFX="/usr/lib/syslinux/isohdpfx.bin"
Check_package chroot/${_ISOHDPFX} syslinux-common
;;
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 12dc0f9dc..1de51d279 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -124,7 +124,7 @@ fi
case "${LB_BUILD_WITH_CHROOT}" in
true)
case "${LB_PARENT_DISTRIBUTION}" in
- wheezy|jessie)
+ wheezy)
case "${_BOOTLOADER}" in
syslinux|extlinux)
Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
@@ -151,7 +151,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
false)
case "${LB_PARENT_DISTRIBUTION}" in
- wheezy|jessie)
+ wheezy)
case "${_BOOTLOADER}" in
syslinux|extlinux)
if [ ! -e /usr/bin/${_BOOTLOADER} ]