From 5d4e1082513f79687d537e47d6ada9c57bff25d2 Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Fri, 23 Oct 2009 19:55:55 +0200 Subject: [PATCH] Adapted grub.cfg and menu.lst for new directory layout. --- templates/boot/grub/grub.cfg | 40 ++++++++++++++++++------------------ templates/boot/grub/menu.lst | 48 ++++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index 4602c1a..e9b9abd 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -19,8 +19,8 @@ else fi menuentry "%GRML_NAME% - release %VERSION% (default)" { - linux /boot/%GRML_NAME%/linux26 apm=power-off vga=791 quiet boot=live nomce - initrd /boot/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live nomce + initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "Memory test (memtest86+)" { @@ -60,48 +60,48 @@ menuentry "Boot OS of first partition on first disk" { } menuentry "%GRML_NAME% - enable persistent mode" { - linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet persistent - initrd /boot/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet persistent + initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - copy grml to RAM" { - linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram=%GRML_NAME%.squashfs - initrd /boot/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram=%GRML_NAME%.squashfs + initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - copy whole medium to RAM" { - linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram - initrd /boot/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram + initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - start X by default" { - linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet startx=wm-ng - initrd /boot/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet startx=wm-ng + initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - disable framebuffer" { - linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=ofonly - initrd /boot/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=ofonly + initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - forensic mode" { - linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect - initrd /boot/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect + initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - failsafe mode" { - linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet 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/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce quiet 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 } menuentry "%GRML_NAME% - debug mode" { - linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 debug boot=live initcall_debug - initrd /boot/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 debug boot=live initcall_debug + initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - serial mode" { - linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 - initrd /boot/%GRML_NAME%/initrd.gz + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 + initrd /boot/%SHORT_NAME%/initrd.gz } # EOF diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst index 3729964..9e413a4 100644 --- a/templates/boot/grub/menu.lst +++ b/templates/boot/grub/menu.lst @@ -12,48 +12,48 @@ background = FFCC33 # define entries: title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer) -kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce -initrd /boot/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce +initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - without framebuffer -kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce -initrd /boot/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us 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/%GRML_NAME%/linux26 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce -initrd /boot/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce +initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - with 800x600 framebuffer -kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce -initrd /boot/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce +initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - failsafe boot -kernel /boot/%GRML_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/%GRML_NAME%/initrd.gz +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/%GRML_NAME%/linux26 apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce -initrd /boot/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us 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/%GRML_NAME%/linux26 toram=%GRML_NAME_SQUASHFS% apm=power-off lang=us vga=791 quiet boot=live nomce -initrd /boot/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/linux26 toram=%GRML_NAME_SQUASHFS% apm=power-off lang=us vga=791 quiet boot=live nomce +initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - copy medium to RAM -kernel /boot/%GRML_NAME%/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce -initrd /boot/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/linux26 toram apm=power-off lang=us 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/%GRML_NAME%/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce partition=/dev/ice1 mbr=/dev/ice -initrd /boot/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us 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/%GRML_NAME%/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live -initrd /boot/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/linux26 vga=791 lang=us 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/%GRML_NAME%/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/%GRML_NAME%/initrd.gz +kernel /boot/%SHORT_NAME%/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/%SHORT_NAME%/initrd.gz title Run memtest86+ kernel /boot/addons/memtest @@ -79,5 +79,5 @@ module /boot/grub/%GRUB_LEGACY% module /boot/grub/core.img # title %GRML_NAME% %VERSION% - old boot method -# kernel /boot/%GRML_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/%GRML_NAME%/minirt26.gz +# 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 -- 2.1.4