diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2007-10-15 21:23:08 -0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:27 +0100 |
| commit | f7f1d3befae331a8d60cd37631b925e6b8185292 (patch) | |
| tree | 042c524229746e075aa9fa9d9013962aeb7bb4d2 | |
| parent | 8fc5ac96af45365a4a5e401b980e5aeeea169b9b (diff) | |
| download | vyos-live-build-f7f1d3befae331a8d60cd37631b925e6b8185292.tar.gz vyos-live-build-f7f1d3befae331a8d60cd37631b925e6b8185292.zip | |
lh_binary_syslinux: always put splash image as splash.{rle,png} to avoid filename issues
| -rwxr-xr-x | helpers/lh_binary_syslinux | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 735346152..68fa0f3d0 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -211,32 +211,31 @@ Copy_syslinux_templates () # Copying custom splash screen if [ "${LH_SYSLINUX_SPLASH}" = "none" ] then - # no splash screen + # no splash screen SPLASH="" rm -f ${SCREEN_PATH}/splash.rle rm -f ${DATA_PATH}/splash.png else - if [ -z "${LH_SYSLINUX_SPLASH}" ] - then - if [ "${LH_SYSLINUX_MENU}" = "disabled" ] - then - SPLASH="${LIVE_DATA_PATH}/splash.rle" - else - SPLASH="${LIVE_DATA_PATH}/splash.png" + if [ "${LH_SYSLINUX_MENU}" = "disabled" ] + then + SPLASH="${LIVE_DATA_PATH}/splash.rle" + else + SPLASH="${LIVE_DATA_PATH}/splash.png" fi - else - if [ ! -e "${LH_SYSLINUX_SPLASH}" ] - then - Echo_error "${LH_SYSLINUX_SPLASH} doen't exist" - exit 1 - else - rm -f ${SCREEN_PATH}/splash.rle - rm -f ${DATA_PATH}/splash.png - cp -f "${LH_SYSLINUX_SPLASH}" ${DATA_PATH} - SPLASH="${LIVE_DATA_PATH}/$(basename ${LH_SYSLINUX_SPLASH})" - fi - fi - fi + + if [ -n "${LH_SYSLINUX_SPLASH}" ] + then + if [ ! -e "${LH_SYSLINUX_SPLASH}" ] + then + Echo_error "${LH_SYSLINUX_SPLASH} doen't exist" + exit 1 + else + rm -f ${SCREEN_PATH}/splash.rle + rm -f ${DATA_PATH}/splash.png + cp -f "${LH_SYSLINUX_SPLASH}" ${DATA_PATH}/`basename ${SPLASH}` + fi + fi + fi } Configure_syslinux_templates () |