Make sure the beep character will not get dropped again, by putting it at the front, and using a non-empty character as replacement, to make sure people choose the right width

suites/ascii
Samuel Thibault 12 years ago
parent 64feaa3cd8
commit 2ec9404694
  1. 2
      build/boot/x86/menu.cfg
  2. 13
      build/config/x86.cfg

@ -1,7 +1,7 @@
menu hshift 7
menu width 61
menu title Debian GNU/Linux installer boot menu${BEEP}
menu title ${BEEP}Debian GNU/Linux installer boot menu
include ${SYSDIR}stdmenu.cfg
include ${SYSDIR}txt.cfg
include ${SYSDIR}amdtxt.cfg

@ -70,6 +70,10 @@ endif
mcopy -i$(TEMP_BOOT) $(TEMP)/disk.lbl ::disk.lbl
# syslinux configs
# Use a non-empty character for beep by default to make sure the menu
# is wide enough when beep is enabled.
beep="_"; \
[ "$(BOOTMENU_BEEP)" = y ] && beep="$$(printf '\a')"; \
subdirs=""; \
$(foreach file,$(shell syslinux-cfgs "$(TEMP_SYSLINUX)"), \
@ -173,6 +177,9 @@ arch_cd_info_dir: x86_syslinux x86_grub_efi
cp -a $(TEMP_BOOT_SCREENS)/splash.png $(TEMP_CD_INFO_DIR); \
fi
# Use a non-empty character for beep by default to make sure the menu
# is wide enough when beep is enabled.
beep="_"; \
[ "$(BOOTMENU_BEEP)" = y ] && beep="$$(printf '\a')"; \
$(foreach file,$(shell syslinux-cfgs "$(TEMP_SYSLINUX)"), \
subdir=`dirname $(file)`; \
@ -255,6 +262,9 @@ arch_miniiso: x86_syslinux x86_grub_efi
ln -f $(TEMP_KERNEL) $(TEMP_CD_TREE)/linux
ln -f $(TEMP_INITRD) $(TEMP_CD_TREE)/initrd.gz
# Use a non-empty character for beep by default to make sure the menu
# is wide enough when beep is enabled.
beep="_"; \
[ "$(BOOTMENU_BEEP)" = y ] && beep="$$(printf '\a')"; \
$(foreach file,$(shell syslinux-cfgs "$(TEMP_SYSLINUX)"), \
subdir=`dirname $(file)`; \
@ -339,6 +349,9 @@ arch_netboot_dir: x86_syslinux
mkdir -p $(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)
cp /usr/lib/syslinux/vesamenu.c32 $(TEMP_NETBOOT_DIR)/$(BOOT_SCREEN_DIR)
# Use a non-empty character for beep by default to make sure the menu
# is wide enough when beep is enabled.
beep="_"; \
[ "$(BOOTMENU_BEEP)" = y ] && beep="$$(printf '\a')"; \
$(foreach file,$(shell syslinux-cfgs "$(TEMP_SYSLINUX)"), \
subdir=`dirname $(file)`; \

Loading…
Cancel
Save