diff options
Diffstat (limited to 'scripts/build/binary_syslinux')
| -rwxr-xr-x | scripts/build/binary_syslinux | 48 |
1 files changed, 5 insertions, 43 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 0dcc2dab1..72116e5ce 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -51,16 +51,7 @@ esac case "${LIVE_IMAGE_TYPE}" in iso*) _BOOTLOADER="isolinux" - - case "${LB_MODE}" in - progress-linux) - _TARGET="binary/boot" - ;; - - *) - _TARGET="binary/isolinux" - ;; - esac + _TARGET="binary/isolinux" ;; netboot) @@ -71,21 +62,12 @@ case "${LIVE_IMAGE_TYPE}" in hdd*|*) case ${LB_BINARY_FILESYSTEM} in fat*|ntfs) - _BOOTLOADER=syslinux - - case "${LB_MODE}" in - progress-linux) - _TARGET="binary/boot" - ;; - - *) - _TARGET="binary/syslinux" - ;; - esac + _BOOTLOADER="syslinux" + _TARGET="binary/syslinux" ;; ext[234]|btrfs) - _BOOTLOADER=extlinux + _BOOTLOADER="extlinux" _TARGET="binary/boot/extlinux" ;; *) @@ -232,15 +214,7 @@ _LIVE_BOOT_VERSION="$(chroot chroot apt-cache policy live-boot | awk '/Installed _LIVE_CONFIG_VERSION="$(chroot chroot apt-cache policy live-config | awk '/Installed: / { print $2 }')" _LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Installed: / { print $2 }')" -case "${LB_MODE}" in - progress-linux) - _PROJECT="Progress Linux" - ;; - - *) - _PROJECT="Debian GNU/Linux" - ;; -esac +_PROJECT="Debian GNU/Linux" for _FILE in "${_TARGET}"/*.cfg ${_TARGET}/*.svg do @@ -314,18 +288,6 @@ if [ -e binary/boot/grub/live-theme/theme.txt ]; then binary/boot/grub/live-theme/theme.txt fi -case "${LB_MODE}" in - progress-linux) - for _FILE in "${_TARGET}/isolinux.bin" "${_TARGET}/isolinux.cfg" "${_TARGET}/syslinux.cfg" - do - if [ -e "${_FILE}" ] - then - mv "${_FILE}" "${_TARGET}/$(echo ${_FILE} | sed -e 's|.*linux|boot|')" - fi - done - ;; -esac - case "${LB_BUILD_WITH_CHROOT}" in true) # Saving cache |