From 504d022a11c485a02cd67287b0144ab853dbf87e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 2 Jan 2008 22:39:54 +0100 Subject: [PATCH] Update templates/boot/grub/menu.lst, templates/boot/isolinux/*.cfg --- debian/changelog | 5 +++++ templates/boot/grub/menu.lst | 8 ++++++-- templates/boot/isolinux/isolinux.cfg | 13 ++++++------- templates/boot/isolinux/syslinux.cfg | 13 ++++++------- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1cc1274..cc0511c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ grml-live (0.0.15) unstable; urgency=low - truecrypt-2.6.23-grml64 * Add new packages to GRML_MEDIUM: - truecrypt-2.6.23-grml64 + * templates/boot/grub/menu.lst, templates/boot/isolinux/*.cfg: + - drop deprecated entries + - add debian2hd for isolinux/syslinux + - fix serial bootoption + - add grml2hd template for grub -- Michael Prokop Fri, 28 Dec 2007 18:48:11 +0100 diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst index 7cd38df..4a58f9b 100644 --- a/templates/boot/grub/menu.lst +++ b/templates/boot/grub/menu.lst @@ -44,12 +44,16 @@ title %GRML_NAME% %VERSION% - copy medium to RAM kernel /boot/isolinux/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce initrd /boot/isolinux/initrd.gz +title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!] +kernel /boot/isolinux/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce partition=/dev/ice1 mbr=/dev/ice +initrd /boot/isolinux/initrd.gz + title %GRML_NAME% %VERSION% - forensic mode kernel /boot/isolinux/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live initrd /boot/isolinux/initrd.gz -title %GRML_NAME% %VERSION% - serial mode -kernel /boot/isolinux/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce +title %GRML_NAME% %VERSION% - serial console mode +kernel /boot/isolinux/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 initrd /boot/isolinux/initrd.gz title Run memtest86+ diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index f6948d7..15c1fe5 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -36,12 +36,6 @@ MENU DEFAULT KERNEL linux26 APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=initrd.gz boot=live nomce -# deprecated: -LABEL old -MENU LABEL old -KERNEL linux26 -APPEND ramdisk_size=100000 init=/etc/init apm=power-off lang=us vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs" - LABEL splash MENU LABEL grml - Bootsplash KERNEL linux26 @@ -52,6 +46,11 @@ MENU LABEL grml2hd KERNEL linux26 APPEND apm=power-off lang=us 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 + LABEL debug MENU LABEL debug KERNEL linux26 @@ -130,7 +129,7 @@ APPEND initrd=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 +APPEND apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=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 976365d..b0c7031 100644 --- a/templates/boot/isolinux/syslinux.cfg +++ b/templates/boot/isolinux/syslinux.cfg @@ -36,12 +36,6 @@ MENU DEFAULT KERNEL linux26 APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=initrd.gz boot=live nomce -# deprecated: -LABEL old -MENU LABEL old -KERNEL linux26 -APPEND ramdisk_size=100000 init=/etc/init apm=power-off lang=us vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs" - LABEL splash MENU LABEL grml - Bootsplash KERNEL linux26 @@ -52,6 +46,11 @@ MENU LABEL grml2hd KERNEL linux26 APPEND apm=power-off lang=us 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 + LABEL debug MENU LABEL debug KERNEL linux26 @@ -130,7 +129,7 @@ APPEND initrd=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 +APPEND apm=power-off lang=us 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