templates/boot/grub/menu.lst: drop bootoption lang=us

diff --git a/debian/changelog b/debian/changelog
index dfe6648..c67f55d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,10 @@ grml-live (0.9.33) UNRELEASED; urgency=low
     Thanks for the suggestions to Sedat Dilek. [Closes: issue756]
   * Use /sbin/mount.ntfs-3g as default handler for ntfs. Thanks
     for bringing this issue up, Richard Hartmann.
+  * templates/boot/grub/menu.lst: drop bootoption lang=us, we
+    specify the default within grml-autoconfig.
 
- -- Michael Prokop <mika@grml.org>  Sat, 14 Nov 2009 13:18:10 +0100
+ -- Michael Prokop <mika@grml.org>  Sat, 14 Nov 2009 13:22:35 +0100
 
 grml-live (0.9.32) unstable; urgency=low
 

diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index 5d3aece..d8e9d21 100644 (file)
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -12,47 +12,47 @@ background  = FFCC33
 
 # define entries:
 title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live nomce 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - without framebuffer
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=794 quiet initrd=initrd.gz boot=live nomce 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 800x600 framebuffer
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - failsafe boot
-kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off
+kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - debug mode
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM
-kernel /boot/%SHORT_NAME%/linux26 toram=%GRML_NAME_SQUASHFS% apm=power-off lang=us vga=791 quiet boot=live nomce
+kernel /boot/%SHORT_NAME%/linux26 toram=%GRML_NAME_SQUASHFS% apm=power-off vga=791 quiet boot=live nomce 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - copy medium to RAM
-kernel /boot/%SHORT_NAME%/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce
+kernel /boot/%SHORT_NAME%/linux26 toram apm=power-off vga=791 quiet boot=live nomce 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!]
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce partition=/dev/ice1 mbr=/dev/ice
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live nomce partition=/dev/ice1 mbr=/dev/ice
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - forensic mode
-kernel /boot/%SHORT_NAME%/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live
+kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - serial console mode
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce noquick console=tty1 console=ttyS0,9600n8 
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce noquick console=tty1 console=ttyS0,9600n8 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title Run memtest86+
@@ -78,6 +78,3 @@ module /boot/addons/bsd4grml/boot.cfg
 module /boot/grub/%GRUB_LEGACY%
 module /boot/grub/core.img
 
-# title %GRML_NAME% %VERSION% - old boot method
-# kernel /boot/%SHORT_NAME%/linux26 ramdisk_size=100000 init=/etc/init apm=power-off lang=us vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs"
-# initrd /boot/%SHORT_NAME%/minirt26.gz