From: Michael Prokop Date: Fri, 20 Feb 2009 16:07:32 +0000 (+0100) Subject: Drop first, unnecessary APPEND line in isolinux.cfg, no longer use the bootoption... X-Git-Tag: v0.9.9~21 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=717584491eef9481962d26e6e73f61180ceacc5e;hp=3e18610b1a0891ed43156c6874842050fed002e6 Drop first, unnecessary APPEND line in isolinux.cfg, no longer use the bootoption lang=us by default --- diff --git a/debian/changelog b/debian/changelog index 70a3cb9..84be938 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,12 @@ grml-live (0.9.9) unstable; urgency=low 'apt-get -t experimental ...' * Consequently drop 'Latest change' lines from all files. * Support generation of sha1sum [Testing: issue622] + * Drop first, unnecessary APPEND line in isolinux.cfg and syslinux.cfg. + [Closes: issue492] + * Do no longer use the bootoption lang=us by default. We use it by default + in grml-autoconfig anyway and this shortens our /proc/cmdline. - -- Michael Prokop Fri, 20 Feb 2009 16:31:04 +0100 + -- Michael Prokop Fri, 20 Feb 2009 17:06:24 +0100 grml-live (0.9.8) unstable; urgency=low diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index 808e9a1..9627cd1 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -1,7 +1,6 @@ # use this to control the bootup via a serial port # SERIAL 0 9600 DEFAULT grml -APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce # DEFAULT menu.c32 TIMEOUT 300 # ONTIMEOUT chain.32 hd0 0 @@ -24,67 +23,68 @@ F10 f10 MENU TITLE grml - Boot Menu +# the default: LABEL grml MENU LABEL grml - Standard Bootup MENU DEFAULT KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL grml2ram MENU LABEL grml2ram - Copy Squashfs file to RAM MENU DEFAULT KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL splash MENU LABEL grml - Bootsplash KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live splash nomce +APPEND apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live splash nomce LABEL grml2hd MENU LABEL grml2hd KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL debian2hd MENU LABEL debian2hd KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=791 initrd=/boot/%GRML_NAME%/initrd.gz boot=live BOOT_IMAGE=debian2hd nomce +APPEND apm=power-off vga=791 initrd=/boot/%GRML_NAME%/initrd.gz boot=live BOOT_IMAGE=debian2hd nomce LABEL debug MENU LABEL debug KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=791 verbose debug=vc debug initrd=/boot/%GRML_NAME%/initrd.gz boot=live initcall_debug nomce +APPEND apm=power-off vga=791 verbose debug=vc debug initrd=/boot/%GRML_NAME%/initrd.gz boot=live initcall_debug nomce LABEL bootchart MENU LABEL bootchart KERNEL /boot/%GRML_NAME%/linux26 -APPEND init=/sbin/bootchartd apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL vmware MENU LABEL vmware KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL qemu MENU LABEL qemu KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce qemu +APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce qemu LABEL grmlx MENU LABEL grmlx KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us startx=wm-ng vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off startx=wm-ng vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL nofb MENU LABEL grml without framebuffer KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=normal video=ofonly quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off vga=normal video=ofonly quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL linux26 MENU LABEL linux26 KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL memtest MENU LABEL memtest @@ -94,27 +94,27 @@ APPEND BOOT_IMAGE=memtest LABEL fb1280x1024 MENU LABEL fb1280x1024 KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=794 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off vga=794 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL fb1024x768 MENU LABEL fb1024x768 KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL fb800x600 MENU LABEL fb800x600 KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=788 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce +APPEND apm=power-off vga=788 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce LABEL failsafe MENU LABEL failsafe KERNEL /boot/%GRML_NAME%/linux26 -APPEND initrd=/boot/%GRML_NAME%/initrd.gz vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm +APPEND initrd=/boot/%GRML_NAME%/initrd.gz vga=normal boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm LABEL forensic MENU LABEL forensic KERNEL /boot/%GRML_NAME%/linux26 -APPEND vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live +APPEND vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live LABEL grub MENU LABEL grub @@ -129,7 +129,7 @@ APPEND initrd=/boot/addons/balder10.imz LABEL serial MENU LABEL serial KERNEL /boot/%GRML_NAME%/linux26 -APPEND apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 +APPEND apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 LABEL userdef MENU LABEL User defined diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg index 947bd31..50a6300 100644 --- a/templates/boot/isolinux/syslinux.cfg +++ b/templates/boot/isolinux/syslinux.cfg @@ -1,7 +1,6 @@ # use this to control the bootup via a serial port # SERIAL 0 9600 DEFAULT grml -APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce # DEFAULT menu.c32 TIMEOUT 300 # ONTIMEOUT chain.32 hd0 0 @@ -24,67 +23,68 @@ F10 f10 MENU TITLE grml - Boot Menu +# the default: LABEL grml MENU LABEL grml - Standard Bootup MENU DEFAULT KERNEL linux26 -APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce LABEL grml2ram MENU LABEL grml2ram - Copy Squashfs file to RAM MENU DEFAULT KERNEL linux26 -APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% lang=us vga=791 quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% vga=791 quiet initrd=initrd.gz boot=live nomce LABEL splash MENU LABEL grml - Bootsplash KERNEL linux26 -APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live splash nomce +APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live splash nomce LABEL grml2hd MENU LABEL grml2hd KERNEL linux26 -APPEND apm=power-off lang=us quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off quiet initrd=initrd.gz boot=live nomce LABEL debian2hd MENU LABEL debian2hd KERNEL linux26 -APPEND apm=power-off lang=us vga=791 initrd=initrd.gz boot=live BOOT_IMAGE=debian2hd nomce +APPEND apm=power-off vga=791 initrd=initrd.gz boot=live BOOT_IMAGE=debian2hd nomce LABEL debug MENU LABEL debug KERNEL linux26 -APPEND apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce +APPEND apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce LABEL bootchart MENU LABEL bootchart KERNEL linux26 -APPEND init=/sbin/bootchartd apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce +APPEND init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce LABEL vmware MENU LABEL vmware KERNEL linux26 -APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce LABEL qemu MENU LABEL qemu KERNEL linux26 -APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu +APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu LABEL grmlx MENU LABEL grmlx KERNEL linux26 -APPEND apm=power-off lang=us startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce LABEL nofb MENU LABEL grml without framebuffer KERNEL linux26 -APPEND apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce LABEL linux26 MENU LABEL linux26 KERNEL linux26 -APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce LABEL memtest MENU LABEL memtest @@ -94,27 +94,27 @@ APPEND BOOT_IMAGE=memtest LABEL fb1280x1024 MENU LABEL fb1280x1024 KERNEL linux26 -APPEND apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off vga=794 quiet initrd=initrd.gz boot=live nomce LABEL fb1024x768 MENU LABEL fb1024x768 KERNEL linux26 -APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce LABEL fb800x600 MENU LABEL fb800x600 KERNEL linux26 -APPEND apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce +APPEND apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce LABEL failsafe MENU LABEL failsafe KERNEL linux26 -APPEND initrd=initrd.gz vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm +APPEND initrd=initrd.gz vga=normal boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm LABEL forensic MENU LABEL forensic KERNEL linux26 -APPEND vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live +APPEND vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live LABEL grub MENU LABEL grub @@ -129,7 +129,7 @@ APPEND initrd=/boot/addons/balder10.imz LABEL serial MENU LABEL serial KERNEL linux26 -APPEND apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 +APPEND apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 LABEL userdef MENU LABEL User defined