Adjust menu.lst + isolinux.cfg on the fly for new directoy layout

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index ccbbdf5..dc3d12f 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -17,7 +17,7 @@ grml-live [-a <architecture>] [-c <classe[s]>] [-g <grml_name>] [-i <iso_name> ]
 *******************************************************************************
 Important! This document is growing as requested. If you have questions which
 aren't answered by this document yet please let me know: <mika@grml.org>!
-This document currently applies to grml-live version 0.3.
+This document currently applies to grml-live version 0.4.
 *******************************************************************************
 
 Description
@@ -104,6 +104,8 @@ Force execution and do not prompt for acknowledgment of configuration.
   -g **GRML_NAME**::
 
 Set the grml flavour name. Common usage examples: grml, grml-small, grml64.
+Please do NOT use blanks inside GRML_NAME, otherwise you might notice problems
+with booting.
 
   -h::
 

diff --git a/grml-live b/grml-live
index 7a9615f..fc18116 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -502,6 +502,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/" "$BUILD_OUTPUT"/boot/isolinux/boot.msg
       sed -i "s/%DATE%/$ISO_DATE/"             "$BUILD_OUTPUT"/boot/isolinux/boot.msg
 
+      sed -i "s/%GRML_NAME%/$GRML_NAME/"       "$BUILD_OUTPUT"/boot/isolinux/isolinux.cfg
+      sed -i "s/%GRML_NAME%/$GRML_NAME/"       "$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg
+
       sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/" "$BUILD_OUTPUT"/boot/isolinux/boot-beep.msg
       sed -i "s/%DATE%/$ISO_DATE/"             "$BUILD_OUTPUT"/boot/isolinux/boot-beep.msg
 

diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index e38f170..7a29dad 100644 (file)
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -14,47 +14,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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+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
-initrd /boot/grml/initrd.gz
+initrd /boot/%GRML_NAME%/initrd.gz
 
 title Run memtest86+
 kernel /boot/addons/memtest

diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index c4b1c9e..e33c69f 100644 (file)
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -1,7 +1,7 @@
 # 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
+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
@@ -28,63 +28,63 @@ LABEL grml
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
 KERNEL /boot/grml/linux26
-APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+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
-APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+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
-APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live splash nomce
+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
-APPEND apm=power-off lang=us quiet initrd=initrd.gz boot=live nomce
+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
-APPEND apm=power-off lang=us vga=791 initrd=initrd.gz boot=live BOOT_IMAGE=debian2hd nomce
+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
-APPEND apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
+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
-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 lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL vmware
 MENU LABEL vmware
 KERNEL /boot/grml/linux26
-APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce
+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
-APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu
+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
-APPEND apm=power-off lang=us startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce
+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
-APPEND apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
+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
-APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL memtest
 MENU LABEL memtest
@@ -94,42 +94,42 @@ APPEND BOOT_IMAGE=memtest
 LABEL fb1280x1024
 MENU LABEL fb1280x1024
 KERNEL /boot/grml/linux26
-APPEND apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce
+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
-APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+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
-APPEND apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce
+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
-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=/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
-APPEND vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live
+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/addons/allinone.img
+APPEND initrd=/boot/%GRML_NAME%//boot/addons/allinone.img
 
 LABEL dos
 MENU LABEL dos
 KERNEL /boot/addons/memdisk
-APPEND initrd=/boot/addons/balder10.imz
+APPEND initrd=/boot/%GRML_NAME%//boot/addons/balder10.imz
 
 LABEL serial
 MENU LABEL serial
 KERNEL /boot/grml/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 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