From: Michael Prokop Date: Sat, 24 Oct 2009 18:32:36 +0000 (+0200) Subject: Document shortcut keys of vesamenu bootsplash; Add templates/boot/addons/gpxe.lkrn X-Git-Tag: v0.9.26~2 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=bfd9828c6d6ffd6e07a87c66b0b18cf5f53f0bed Document shortcut keys of vesamenu bootsplash; Add templates/boot/addons/gpxe.lkrn --- diff --git a/debian/changelog b/debian/changelog index d49c240..6f96ebd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ grml-live (0.9.26) UNRELEASED; urgency=low [ Michael Prokop ] * Update templates/boot/grub to grub2 version 1.97~beta4-1. * Add templates/boot/isolinux/ifcpu64.c32. + * Add templates/boot/addons/gpxe.lkrn. + * Document 'Shortcut keys of vesamenu bootsplash' in isolinux.cfg. * templates/boot/isolinux/{addons,syslinux}.cfg: Use new ldbsd.com feature (command line) to chain into GRUB2 directly from isolinux or syslinux without an intermediate interactive/menu prompt. @@ -11,7 +13,9 @@ grml-live (0.9.26) UNRELEASED; urgency=low [ Thorsten Glaser ] * Update MirOS bsd4grml to 20091024 (ldbsd.com and ldbsd.txt only). - -- Michael Prokop Sat, 24 Oct 2009 19:01:04 +0200 + [ Michael Prokop ] + + -- Michael Prokop Sat, 24 Oct 2009 20:31:10 +0200 grml-live (0.9.25) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 545f232..7768ac1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -52,6 +52,13 @@ License information for the bsd4grml files shipped as See /usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT for details. +License information for the file gpxe.lkrn shipped as +/usr/share/grml-live/templates/boot/addons/gpxe.lkrn: + + Downloaded from + Etherboot is Open Source under the GNU General Public License Version 2 (GPL2). + Visit http://etherboot.org/wiki/usermanual?s[]=gpl#license for details. + License information for the file hdt.c32 shipped as /usr/share/grml-live/templates/boot/addons/hdt.c32 diff --git a/templates/boot/addons/gpxe.lkrn b/templates/boot/addons/gpxe.lkrn new file mode 100644 index 0000000..2cc7a8a Binary files /dev/null and b/templates/boot/addons/gpxe.lkrn differ diff --git a/templates/boot/isolinux/addons.cfg b/templates/boot/isolinux/addons.cfg index 6dde7b8..9c0b8b4 100644 --- a/templates/boot/isolinux/addons.cfg +++ b/templates/boot/isolinux/addons.cfg @@ -7,7 +7,7 @@ menu exit menu separator label grub2 - menu label Run Bootloader Grub2 + menu label Run Bootloader Grub^2 kernel /boot/addons/bsd4grml/ldbsd.com append echo Loading GRUB...`machine exec grub /boot/grub/core.img @@ -16,7 +16,7 @@ label grub2 endtext label grub1 - menu label Run Bootloader ^Grub-Legacy (version 1) + menu label Run Bootloader Grub-Legacy (version ^1) kernel /boot/addons/bsd4grml/ldbsd.com append echo Loading GRUB...`machine exec grub /boot/grub/%GRUB_LEGACY% @@ -36,8 +36,17 @@ label allinone booting via PXE (with gPXE support),... endtext +label gpxe + menu label Run GP^XE + kernel /boot/addons/gpxe.lkrn + + text help + Start Etherboot/gPXE for booting via + network (PXE). + endtest + label dos - menu label Run FreeDO^S + menu label Run ^FreeDOS kernel /boot/addons/memdisk append initrd=/boot/addons/balder10.imz @@ -46,7 +55,7 @@ label dos endtext label bsd - menu label Run MirOS ^bsd4grml + menu label Run MirOS bsd^4grml kernel /boot/addons/bsd4grml/ldbsd.com text help diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg index 4ca3f15..3788fca 100644 --- a/templates/boot/isolinux/grml.cfg +++ b/templates/boot/isolinux/grml.cfg @@ -3,7 +3,7 @@ # generic ones label debug - menu label %GRML_NAME% - Debug Mode + menu label %GRML_NAME% - ^Debug Mode kernel /boot/%SHORT_NAME%/linux26 append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 verbose debug=vc debug initcall_debug nomce @@ -14,7 +14,7 @@ label debug endtext label nofb - menu label %GRML_NAME% - Disable Framebuffer + menu label %GRML_NAME% - Dis^able Framebuffer kernel /boot/%SHORT_NAME%/linux26 append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal quiet nomce @@ -23,7 +23,7 @@ label nofb endtext label lang-de - menu label %GRML_NAME% - Enable SSH (with random password) + menu label %GRML_NAME% - Enable ^SSH (with random password) kernel /boot/%SHORT_NAME%/linux26 append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce ssh @@ -63,7 +63,7 @@ label forensic endtext label lang-de - menu label %GRML_NAME% - German Settings + menu label %GRML_NAME% - ^German Settings kernel /boot/%SHORT_NAME%/linux26 append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce lang=de @@ -72,7 +72,7 @@ label lang-de endtext label %GRML_NAME%x - menu label %GRML_NAME% - Graphical Mode + menu label %GRML_NAME% - Graphical ^Mode kernel /boot/%SHORT_NAME%/linux26 append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off quiet nomce startx=wm-ng @@ -97,7 +97,7 @@ label grml2ram endtext label serial - menu label %GRML_NAME% - Serial Console + menu label %GRML_NAME% - Serial ^Console kernel /boot/%SHORT_NAME%/linux26 append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal video=vesafb:off quiet nomce console=tty1 console=ttyS0,9600n8 diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index 1aa618e..393cafe 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -29,6 +29,42 @@ # - vesamenu.c32 -> vesamenu binary for graphical boot menu # - vesamenu.cfg -> configuration of graphical boot splash/menu ################################################################################ +# Shortcut keys of vesamenu bootsplash +# +# Instructions: Just press the specified key to jump to the according menu entry. +# For example press 'i' to select the 'Isolinux prompt' menu entry. +# +# s = Standard ($version, $arch) +# +# Additional boot entries for $FLAVOUR: +# +# b = Back to main menu... +# d = Debug Mode +# a = Disable Framebuffer +# s = Enable SSH (with random password) +# f = Failsafe Mode +# o = Forensic Mode +# g = German Settings +# m = Graphical Mode +# r = Load to RAM +# c = Serial Console +# +# Further boot options: +# Addons: +# +# b = Back to main menu... +# 2 = Grub2 +# 1 = Grub1 +# a = All-in-One-Image +# x = GPXE +# f = FreeDOS +# 4 = MirOS bsd4grml +# m = Memtest86+ +# t = Hardware Detection Tool +# +# i = Isolinux prompt +# b = Boot from Hard Disk +################################################################################ # timeout settings: timeout 300 diff --git a/templates/boot/isolinux/options.cfg b/templates/boot/isolinux/options.cfg index 8334d21..0058eb0 100644 --- a/templates/boot/isolinux/options.cfg +++ b/templates/boot/isolinux/options.cfg @@ -3,5 +3,5 @@ menu separator # addons: label - -menu label ^Further boot options: +menu label Further boot options: menu disable