From a31541517b344d447fd5129ce4d6e0d222166635 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 14 Feb 2009 11:07:17 +0100 Subject: Updating syslinux menu configuration. --- functions/defaults.sh | 23 ++- helpers/lh_binary_syslinux | 41 ++-- templates/syslinux/common/help.cfg | 10 - templates/syslinux/common/live.cfg | 17 ++ templates/syslinux/common/menu.cfg | 17 -- templates/syslinux/common/syslinux.cfg | 3 - templates/syslinux/menu/data/iso01.f14.psf | Bin 4556 -> 0 bytes templates/syslinux/menu/data/splash.png | Bin 14015 -> 0 bytes templates/syslinux/menu/data/splash.svg | 304 ----------------------------- templates/syslinux/menu/exithelp.cfg | 3 + templates/syslinux/menu/footer.cfg | 4 - templates/syslinux/menu/header.cfg | 21 -- templates/syslinux/menu/menu.cfg | 12 ++ templates/syslinux/menu/prompt.cfg | 20 +- templates/syslinux/menu/splash.png | Bin 0 -> 6329 bytes templates/syslinux/menu/stdmenu.cfg | 15 ++ templates/syslinux/menu/syslinux.cfg | 4 + templates/syslinux/normal/data/splash.rle | Bin 10489 -> 0 bytes templates/syslinux/normal/help.cfg | 10 + templates/syslinux/normal/splash.rle | Bin 0 -> 10489 bytes templates/syslinux/normal/syslinux.cfg | 3 + 21 files changed, 121 insertions(+), 386 deletions(-) delete mode 100644 templates/syslinux/common/help.cfg create mode 100644 templates/syslinux/common/live.cfg delete mode 100644 templates/syslinux/common/menu.cfg delete mode 100644 templates/syslinux/common/syslinux.cfg delete mode 100644 templates/syslinux/menu/data/iso01.f14.psf delete mode 100644 templates/syslinux/menu/data/splash.png delete mode 100644 templates/syslinux/menu/data/splash.svg create mode 100644 templates/syslinux/menu/exithelp.cfg delete mode 100644 templates/syslinux/menu/footer.cfg delete mode 100644 templates/syslinux/menu/header.cfg create mode 100644 templates/syslinux/menu/menu.cfg create mode 100644 templates/syslinux/menu/splash.png create mode 100644 templates/syslinux/menu/stdmenu.cfg create mode 100644 templates/syslinux/menu/syslinux.cfg delete mode 100644 templates/syslinux/normal/data/splash.rle create mode 100644 templates/syslinux/normal/help.cfg create mode 100644 templates/syslinux/normal/splash.rle create mode 100644 templates/syslinux/normal/syslinux.cfg diff --git a/functions/defaults.sh b/functions/defaults.sh index c01e7ba..4fb6e76 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -750,11 +750,28 @@ Set_defaults () LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT:-0}" # Setting syslinux menu - LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-disabled}" + case "${LH_DISTRIBUTION}" in + etch) + LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-disabled}" + ;; + + *) + LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-enabled}" + ;; + esac # Setting syslinux menu live entries - LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Start ${LH_ISO_APPLICATION}}" - LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} - Fail Safe}" + case "${LH_MODE}" in + debian|debian-release) + LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Live}" + LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}" + ;; + + *) + LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Start ${LH_ISO_APPLICATION}}" + LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}" + ;; + esac # Settings memtest menu entry LH_SYSLINUX_MENU_MEMTEST_ENTRY="${LH_SYSLINUX_MENU_MEMTEST_ENTRY:-Memory test}" diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 1aa12a4..f5dea99 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -72,10 +72,10 @@ Syslinux_memtest_entry () MENULABEL="$(Utf8_to_latin1 "${2}")" KERNEL="${3}" - MEMTEST="${MEMTEST}\nLABEL ${LABEL}\n" + MEMTEST="${MEMTEST}\nlabel ${LABEL}\n" # Write the menu label if the syslinux menu is being use - MEMTEST="${MEMTEST}\tMENU LABEL ${MENULABEL}\n" + MEMTEST="${MEMTEST}\tmenu label ${MENULABEL}\n" MEMTEST="${MEMTEST}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n" MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')" } @@ -104,18 +104,18 @@ Syslinux_live_entry () esac # Regular kernel - LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n" + LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}\n" # Write the menu label if the syslinux menu is being use - LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL}\n" + LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL}\n" LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND}\n" # Failsafe kernel - LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}failsafe\n" + LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n" # Write the menu label if the syslinux menu is being use - LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL} (fail-safe mode)\n" + LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL} (failsafe)\n" LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n" } @@ -162,8 +162,8 @@ Syslinux_install_entry () ;; esac - LINUX_INSTALL="${LINUX_INSTALL}\nLABEL $(echo "${TYPE}" | tr A-Z a-z)${TYPE_SUFFIX}\n" - LINUX_INSTALL="${LINUX_INSTALL}\tMENU LABEL Start ${LABEL} ${TYPE}\n" + LINUX_INSTALL="${LINUX_INSTALL}\nlabel $(echo "${TYPE}" | tr A-Z a-z)${TYPE_SUFFIX}\n" + LINUX_INSTALL="${LINUX_INSTALL}\tmenu label ${LABEL} ${TYPE}\n" LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${LIVE_INSTALL_KERNEL_PATH}/${KERNEL}\n" LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${LIVE_INSTALL_KERNEL_PATH}/${INITRD} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\n" done @@ -175,14 +175,12 @@ Copy_syslinux_templates () if [ "${LH_SYSLINUX_MENU}" = "disabled" ] then - cp "${TEMPLATES}"/normal/*.cfg ${SCREEN_PATH} - cp "${TEMPLATES}"/normal/data/* ${DATA_PATH} + cp "${TEMPLATES}"/normal/* ${SCREEN_PATH} else - cp "${TEMPLATES}"/menu/*.cfg ${SCREEN_PATH} - cp "${TEMPLATES}"/menu/data/* ${DATA_PATH} + cp "${TEMPLATES}"/menu/* ${SCREEN_PATH} # Grab menu binary - MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g') + MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g') case "${LH_CHROOT_BUILD}" in enabled) cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH} @@ -228,6 +226,11 @@ Copy_syslinux_templates () rm -f ${SCREEN_PATH}/*.install* fi + if [ "${LH_SYSLINUX_MENU}" = "enabled" ] + then + rm -f ${DATA_PATH}/boot.txt + fi + # Copying custom splash screen if [ "${LH_SYSLINUX_SPLASH}" = "none" ] then @@ -332,11 +335,11 @@ case "${LH_BINARY_IMAGES}" in SYSLINUX_PATH="binary/isolinux" KERNEL_PATH="binary/${INITFS}" SCREEN_PATH="${SYSLINUX_PATH}" - DATA_PATH="${SCREEN_PATH}/data" + DATA_PATH="${SCREEN_PATH}" LIVE_KERNEL_PATH="/${INITFS}" LIVE_INSTALL_KERNEL_PATH="/install" LIVE_SCREEN_PATH="/isolinux" - LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data" + LIVE_DATA_PATH="${LIVE_SCREEN_PATH}" MEDIA="CD-ROM" ;; @@ -344,11 +347,11 @@ case "${LH_BINARY_IMAGES}" in SYSLINUX_PATH="tftpboot" KERNEL_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}" SCREEN_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}/boot-screens" - DATA_PATH="${SCREEN_PATH}/data" + DATA_PATH="${SCREEN_PATH}" LIVE_KERNEL_PATH="debian-live/${LH_ARCHITECTURE}" LIVE_INSTALL_KERNEL_PATH="debian-install/${LH_ARCHITECTURE}" LIVE_SCREEN_PATH="debian-live/${LH_ARCHITECTURE}/boot-screens" - LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data" + LIVE_DATA_PATH="${LIVE_SCREEN_PATH}" MEDIA="netboot" ;; @@ -356,11 +359,11 @@ case "${LH_BINARY_IMAGES}" in SYSLINUX_PATH="binary/syslinux" KERNEL_PATH="binary/${INITFS}" SCREEN_PATH="${SYSLINUX_PATH}" - DATA_PATH="${SCREEN_PATH}/data" + DATA_PATH="${SCREEN_PATH}" LIVE_KERNEL_PATH="/${INITFS}" LIVE_INSTALL_KERNEL_PATH="/install" LIVE_SCREEN_PATH="/syslinux" - LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data" + LIVE_DATA_PATH="${LIVE_SCREEN_PATH}" # Syslinux v3.31 in etch does not support sub directories, /path/kernel, # when using FAT hard drive images diff --git a/templates/syslinux/common/help.cfg b/templates/syslinux/common/help.cfg deleted file mode 100644 index 414f388..0000000 --- a/templates/syslinux/common/help.cfg +++ /dev/null @@ -1,10 +0,0 @@ -f1 {$LIVE_SCREEN_PATH}/f1.txt -f2 {$LIVE_SCREEN_PATH}/f2.txt -f3 {$LIVE_SCREEN_PATH}/f3.txt -f4 {$LIVE_SCREEN_PATH}/f4.txt -f5 {$LIVE_SCREEN_PATH}/f5.txt -f6 {$LIVE_SCREEN_PATH}/f6.txt -f7 {$LIVE_SCREEN_PATH}/f7.txt -f8 {$LIVE_SCREEN_PATH}/f8.txt -f9 {$LIVE_SCREEN_PATH}/f9.txt -f0 {$LIVE_SCREEN_PATH}/f10.txt diff --git a/templates/syslinux/common/live.cfg b/templates/syslinux/common/live.cfg new file mode 100644 index 0000000..b5a6e5c --- /dev/null +++ b/templates/syslinux/common/live.cfg @@ -0,0 +1,17 @@ +{$LINUX_LIVE} + +{$LINUX_INSTALL} + +{$MEMTEST} + +#label floppy +# localboot 0x00 + +#label disk1 +# localboot 0x80 + +#label disk2 +# localboot 0x81 + +#label nextboot +# localboot -1 diff --git a/templates/syslinux/common/menu.cfg b/templates/syslinux/common/menu.cfg deleted file mode 100644 index b5a6e5c..0000000 --- a/templates/syslinux/common/menu.cfg +++ /dev/null @@ -1,17 +0,0 @@ -{$LINUX_LIVE} - -{$LINUX_INSTALL} - -{$MEMTEST} - -#label floppy -# localboot 0x00 - -#label disk1 -# localboot 0x80 - -#label disk2 -# localboot 0x81 - -#label nextboot -# localboot -1 diff --git a/templates/syslinux/common/syslinux.cfg b/templates/syslinux/common/syslinux.cfg deleted file mode 100644 index 3e2682e..0000000 --- a/templates/syslinux/common/syslinux.cfg +++ /dev/null @@ -1,3 +0,0 @@ -include {$LIVE_SCREEN_PATH}/header.cfg -include {$LIVE_SCREEN_PATH}/menu.cfg -include {$LIVE_SCREEN_PATH}/footer.cfg diff --git a/templates/syslinux/menu/data/iso01.f14.psf b/templates/syslinux/menu/data/iso01.f14.psf deleted file mode 100644 index 0cc056a..0000000 Binary files a/templates/syslinux/menu/data/iso01.f14.psf and /dev/null differ diff --git a/templates/syslinux/menu/data/splash.png b/templates/syslinux/menu/data/splash.png deleted file mode 100644 index c2a8312..0000000 Binary files a/templates/syslinux/menu/data/splash.png and /dev/null differ diff --git a/templates/syslinux/menu/data/splash.svg b/templates/syslinux/menu/data/splash.svg deleted file mode 100644 index 44c5ac1..0000000 --- a/templates/syslinux/menu/data/splash.svg +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - Debian Live - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/syslinux/menu/exithelp.cfg b/templates/syslinux/menu/exithelp.cfg new file mode 100644 index 0000000..a538904 --- /dev/null +++ b/templates/syslinux/menu/exithelp.cfg @@ -0,0 +1,3 @@ +label menu + kernel {$LIVE_DATA_PATH}/vesamenu.c32 + config isolinux.cfg diff --git a/templates/syslinux/menu/footer.cfg b/templates/syslinux/menu/footer.cfg deleted file mode 100644 index beef0f4..0000000 --- a/templates/syslinux/menu/footer.cfg +++ /dev/null @@ -1,4 +0,0 @@ -label help - menu label ^Help - say - config {$LIVE_SCREEN_PATH}/prompt.cfg diff --git a/templates/syslinux/menu/header.cfg b/templates/syslinux/menu/header.cfg deleted file mode 100644 index 9d89bdc..0000000 --- a/templates/syslinux/menu/header.cfg +++ /dev/null @@ -1,21 +0,0 @@ -default {$LIVE_DATA_PATH}/vesamenu.c32 -font {$LIVE_DATA_PATH}/iso01.f14.psf - -timeout {$LH_SYSLINUX_TIMEOUT} -prompt 0 - -menu background {$SPLASH} -menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #ff4c0000 none -menu color unsel * #ff4c0000 #00000000 none -menu color hotsel * #fffc1818 #ff4c0000 none -menu color hotkey * #fffc1818 #ffffffff none -menu color tabmsg * #ff4c0000 #00000000 none -menu color timeout_msg * #ff4c0000 #00000000 none -menu color timeout * #fffc1818 #00000000 none -menu vshift 8 -menu hshift 5 -menu width 70 -menu tabmsg Press [Tab] to edit the menu entry -menu autoboot Boot default in # seconds -menu timeoutrow 16 diff --git a/templates/syslinux/menu/menu.cfg b/templates/syslinux/menu/menu.cfg new file mode 100644 index 0000000..53865b2 --- /dev/null +++ b/templates/syslinux/menu/menu.cfg @@ -0,0 +1,12 @@ +menu hshift 13 +menu width 49 + +menu title Debian boot menu +include stdmenu.cfg +include live.cfg +label help + menu label ^Help + text help + Display help screens; type 'menu' at boot prompt to return to this menu + endtext + config prompt.cfg diff --git a/templates/syslinux/menu/prompt.cfg b/templates/syslinux/menu/prompt.cfg index 3ea1ab4..691ebda 100644 --- a/templates/syslinux/menu/prompt.cfg +++ b/templates/syslinux/menu/prompt.cfg @@ -1,6 +1,16 @@ prompt 1 -timeout {$LH_SYSLINUX_TIMEOUT} -default live -display {$LIVE_SCREEN_PATH}/f1.txt -include {$LIVE_SCREEN_PATH}/menu.cfg -include {$LIVE_SCREEN_PATH}/help.cfg +display f1.txt +timeout 0 +include menu.cfg +include exithelp.cfg + +f1 f1.txt +f2 f2.txt +f3 f3.txt +f4 f4.txt +f5 f5.txt +f6 f6.txt +f7 f7.txt +f8 f8.txt +f9 f9.txt +f0 f10.txt diff --git a/templates/syslinux/menu/splash.png b/templates/syslinux/menu/splash.png new file mode 100644 index 0000000..75f1a3c Binary files /dev/null and b/templates/syslinux/menu/splash.png differ diff --git a/templates/syslinux/menu/stdmenu.cfg b/templates/syslinux/menu/stdmenu.cfg new file mode 100644 index 0000000..9b10dea --- /dev/null +++ b/templates/syslinux/menu/stdmenu.cfg @@ -0,0 +1,15 @@ +menu background {$SPLASH} +menu color title * #FFFFFFFF * +menu color border * #00000000 #00000000 none +menu color sel * #ffffffff #76a1d0ff * +menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * +menu color tabmsg * #ffffffff #00000000 * +menu color help 37;40 #ffdddd00 #00000000 none +menu vshift 12 +menu rows 10 +menu helpmsgrow 15 +# The command line must be at least one line from the bottom. +menu cmdlinerow 16 +menu timeoutrow 16 +menu tabmsgrow 18 +menu tabmsg Press ENTER to boot or TAB to edit a menu entry diff --git a/templates/syslinux/menu/syslinux.cfg b/templates/syslinux/menu/syslinux.cfg new file mode 100644 index 0000000..fa55a7c --- /dev/null +++ b/templates/syslinux/menu/syslinux.cfg @@ -0,0 +1,4 @@ +include menu.cfg +default {$LIVE_DATA_PATH}/vesamenu.c32 +prompt 0 +timeout {$LH_SYSLINUX_TIMEOUT} diff --git a/templates/syslinux/normal/data/splash.rle b/templates/syslinux/normal/data/splash.rle deleted file mode 100644 index df3e15d..0000000 Binary files a/templates/syslinux/normal/data/splash.rle and /dev/null differ diff --git a/templates/syslinux/normal/help.cfg b/templates/syslinux/normal/help.cfg new file mode 100644 index 0000000..414f388 --- /dev/null +++ b/templates/syslinux/normal/help.cfg @@ -0,0 +1,10 @@ +f1 {$LIVE_SCREEN_PATH}/f1.txt +f2 {$LIVE_SCREEN_PATH}/f2.txt +f3 {$LIVE_SCREEN_PATH}/f3.txt +f4 {$LIVE_SCREEN_PATH}/f4.txt +f5 {$LIVE_SCREEN_PATH}/f5.txt +f6 {$LIVE_SCREEN_PATH}/f6.txt +f7 {$LIVE_SCREEN_PATH}/f7.txt +f8 {$LIVE_SCREEN_PATH}/f8.txt +f9 {$LIVE_SCREEN_PATH}/f9.txt +f0 {$LIVE_SCREEN_PATH}/f10.txt diff --git a/templates/syslinux/normal/splash.rle b/templates/syslinux/normal/splash.rle new file mode 100644 index 0000000..df3e15d Binary files /dev/null and b/templates/syslinux/normal/splash.rle differ diff --git a/templates/syslinux/normal/syslinux.cfg b/templates/syslinux/normal/syslinux.cfg new file mode 100644 index 0000000..3e2682e --- /dev/null +++ b/templates/syslinux/normal/syslinux.cfg @@ -0,0 +1,3 @@ +include {$LIVE_SCREEN_PATH}/header.cfg +include {$LIVE_SCREEN_PATH}/menu.cfg +include {$LIVE_SCREEN_PATH}/footer.cfg -- cgit v1.0