From dc760eb4e7b47894368e6ca19e5d6267442aca91 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 18 Oct 2009 16:51:51 +0200 Subject: [PATCH] Add trailing whitespaces to isolinux/hidden.cfg + isolinux/syslinux.cfg; update changelog --- debian/changelog | 3 ++- templates/boot/isolinux/hidden.cfg | 28 ++++++++++++++-------------- templates/boot/isolinux/syslinux.cfg | 36 ++++++++++++++++++------------------ 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index fdecb67..91123ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ grml-live (0.9.24) UNRELEASED; urgency=low [ Ulrich Dangel ] * Update templates/GRML/grml-cheatcodes.txt: mention nodhcphostname. + * Changed isolinux vesamenu layout to support better multiiso layout. [ Michael Prokop ] * Software related changes: @@ -10,7 +11,7 @@ grml-live (0.9.24) UNRELEASED; urgency=low - Drop ipset from GRML_FULL + GRML_FORENSIC (it's part of xtables-addons-common). - -- Michael Prokop Sun, 18 Oct 2009 14:05:41 +0200 + -- Michael Prokop Sun, 18 Oct 2009 16:51:22 +0200 grml-live (0.9.23) unstable; urgency=low diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg index cd4d7e8..30580e2 100644 --- a/templates/boot/isolinux/hidden.cfg +++ b/templates/boot/isolinux/hidden.cfg @@ -1,52 +1,52 @@ label splash menu hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append init=/sbin/bootchartd apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide @@ -56,22 +56,22 @@ append BOOT_IMAGE=memtest label fb1280x1024 menu hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 serial menu hide kernel /boot/%GRML_NAME%/linux26 -append apm=power-off 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 hide diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg index 7b1fe15..664b863 100644 --- a/templates/boot/isolinux/syslinux.cfg +++ b/templates/boot/isolinux/syslinux.cfg @@ -28,62 +28,62 @@ LABEL grml MENU LABEL grml - Standard Bootup MENU DEFAULT KERNEL linux26 -APPEND apm=power-off 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 KERNEL linux26 -APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% 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 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 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 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 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 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 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 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 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 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 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 @@ -93,27 +93,27 @@ APPEND BOOT_IMAGE=memtest LABEL fb1280x1024 MENU LABEL fb1280x1024 KERNEL linux26 -APPEND apm=power-off 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 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 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 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 +APPEND initrd=initrd.gz 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 LABEL forensic MENU LABEL forensic KERNEL linux26 -APPEND vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live +APPEND vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live LABEL grub MENU LABEL grub @@ -137,7 +137,7 @@ APPEND pciids=/boot/addons/pci.ids LABEL serial MENU LABEL serial KERNEL linux26 -APPEND apm=power-off 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 -- 2.1.4