From: Michael Prokop <devnull@localhost>
Date: Fri, 15 Feb 2008 14:48:03 +0000 (+0100)
Subject: Fix path in menu.lst + isolinux.cfg
X-Git-Tag: 0.4~2
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=ec6b52311380dd2b62058d9a807946fcb3d97cba

Fix path in menu.lst + isolinux.cfg
---

diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index 7a29dad..68b2a61 100644
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -13,47 +13,47 @@ background  = FFCC33
 
 # define entries:
 title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)
-kernel /boot/grml/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce
+kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce
 initrd /boot/%GRML_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - without framebuffer
-kernel /boot/grml/linux26 apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
+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
 
 title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer
-kernel /boot/grml/linux26 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce
+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
 
 title %GRML_NAME% %VERSION% - with 800x600 framebuffer
-kernel /boot/grml/linux26 apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce
+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
 
 title %GRML_NAME% %VERSION% - failsafe boot
-kernel /boot/grml/linux26 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
+kernel /boot/%GRML_NAME%/linux26 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
 initrd /boot/%GRML_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - debug mode
-kernel /boot/grml/linux26 apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
+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
 
 title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM
-kernel /boot/grml/linux26 toram=grml.squashfs apm=power-off lang=us vga=791 quiet boot=live nomce
+kernel /boot/%GRML_NAME%/linux26 toram=grml.squashfs apm=power-off lang=us vga=791 quiet boot=live nomce
 initrd /boot/%GRML_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - copy medium to RAM
-kernel /boot/grml/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce
+kernel /boot/%GRML_NAME%/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce
 initrd /boot/%GRML_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!]
-kernel /boot/grml/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce partition=/dev/ice1 mbr=/dev/ice
+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
 
 title %GRML_NAME% %VERSION% - forensic mode
-kernel /boot/grml/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live
+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
 
 title %GRML_NAME% %VERSION% - serial console mode
-kernel /boot/grml/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8
+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
 
 title Run memtest86+
@@ -64,5 +64,5 @@ kernel /boot/addons/memdisk
 initrd /boot/addons/balder10.imz
 
 # title %GRML_NAME% %VERSION% - old boot method
-# kernel /boot/grml/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/minirt26.gz
+# 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
diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index e33c69f..74f3c12 100644
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -27,63 +27,63 @@ MENU TITLE grml - Boot Menu
 LABEL grml
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
-KERNEL /boot/grml/linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND apm=power-off lang=us 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/linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL splash
 MENU LABEL grml - Bootsplash
-KERNEL /boot/grml/linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live splash nomce
 
 LABEL grml2hd
 MENU LABEL grml2hd
-KERNEL /boot/grml/linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND apm=power-off lang=us quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL debian2hd
 MENU LABEL debian2hd
-KERNEL /boot/grml/linux26
+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
 
 LABEL debug
 MENU LABEL debug
-KERNEL /boot/grml/linux26
+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
 
 LABEL bootchart
 MENU LABEL bootchart
-KERNEL /boot/grml/linux26
+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
 
 LABEL vmware
 MENU LABEL vmware
-KERNEL /boot/grml/linux26
+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
 
 LABEL qemu
 MENU LABEL qemu
-KERNEL /boot/grml/linux26
+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
 
 LABEL grmlx
 MENU LABEL grmlx
-KERNEL /boot/grml/linux26
+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
 
 LABEL nofb
 MENU LABEL grml without framebuffer
-KERNEL /boot/grml/linux26
+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
 
 LABEL linux26
 MENU LABEL linux26
-KERNEL /boot/grml/linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL memtest
@@ -93,48 +93,48 @@ APPEND BOOT_IMAGE=memtest
 
 LABEL fb1280x1024
 MENU LABEL fb1280x1024
-KERNEL /boot/grml/linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND apm=power-off lang=us vga=794 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL fb1024x768
 MENU LABEL fb1024x768
-KERNEL /boot/grml/linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL fb800x600
 MENU LABEL fb800x600
-KERNEL /boot/grml/linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND apm=power-off lang=us vga=788 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL failsafe
 MENU LABEL failsafe
-KERNEL /boot/grml/linux26
+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
 
 LABEL forensic
 MENU LABEL forensic
-KERNEL /boot/grml/linux26
+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
 
 LABEL grub
 MENU LABEL grub
 KERNEL /boot/addons/memdisk
-APPEND initrd=/boot/%GRML_NAME%//boot/addons/allinone.img
+APPEND initrd=/boot/addons/allinone.img
 
 LABEL dos
 MENU LABEL dos
 KERNEL /boot/addons/memdisk
-APPEND initrd=/boot/%GRML_NAME%//boot/addons/balder10.imz
+APPEND initrd=/boot/addons/balder10.imz
 
 LABEL serial
 MENU LABEL serial
-KERNEL /boot/grml/linux26
+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
 
 LABEL userdef
 MENU LABEL User defined
 MENU HIDE
-KERNEL /boot/grml/linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND ###############################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
 LABEL hda
 MENU LABEL Boot First Harddrive (via chain.c32)