diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-02-18 17:12:59 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:04 +0100 |
| commit | 9d6a4dedc2736389349345c29d3a8a48b7b70692 (patch) | |
| tree | b227ffc3d77fcd3ba49dabbda5e2674c43f8bea3 /helpers/binary_syslinux | |
| parent | 2dc16bc40d06c08030dc86b736d169a9cd65f791 (diff) | |
| download | live-build-9d6a4dedc2736389349345c29d3a8a48b7b70692.zip live-build-9d6a4dedc2736389349345c29d3a8a48b7b70692.tar.gz | |
Cleaning up usb helpers for a future usb-zip addition.
Diffstat (limited to 'helpers/binary_syslinux')
| -rwxr-xr-x | helpers/binary_syslinux | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/helpers/binary_syslinux b/helpers/binary_syslinux index ba7f9d5..9d4cab1 100755 --- a/helpers/binary_syslinux +++ b/helpers/binary_syslinux @@ -90,7 +90,7 @@ Syslinux_live_entry () APPEND="${5}" case "${LH_BINARY_IMAGES}" in - iso|usb-hdd) + iso|usb*) NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz[0-9]\+$' | wc -l)" NUMBER="$((${NUMBER} +1))" @@ -334,7 +334,7 @@ Configure_syslinux_templates () done case "${LH_BINARY_IMAGES}" in - usb-hdd) + usb*) if [ -f "${SYSLINUX_PATH}/exithelp.cfg" ] then sed -i -e "s|config isolinux.cfg|config syslinux.cfg|" "${SYSLINUX_PATH}"/exithelp.cfg @@ -387,7 +387,7 @@ case "${LH_BINARY_IMAGES}" in MEDIA="netboot" ;; - tar|usb-hdd) + usb*|tar) SYSLINUX_PATH="binary/syslinux" KERNEL_PATH="binary/${INITFS}" SCREEN_PATH="${SYSLINUX_PATH}" @@ -631,7 +631,7 @@ case "${LH_BINARY_IMAGES}" in fi ;; - tar|usb-hdd) + usb*|tar) case "${LH_CHROOT_BUILD}" in true) cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin |