Rework syslinux.cfg, update grml2ram stuff

diff --git a/debian/changelog b/debian/changelog
index a4af97b..28ab5e7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ grml-live (0.5) unstable; urgency=low
 
   * Make sure we use ${GRML_NAME}.squashfs instead of hardcoded
     grml.squashfs.
+  * Update grml2ram/toram information inside bootsplashes.
 
- -- Michael Prokop <mika@grml.org>  Sun, 17 Feb 2008 00:44:18 +0100
+ -- Michael Prokop <mika@grml.org>  Wed, 20 Feb 2008 16:41:06 +0100
 
 grml-live (0.4) unstable; urgency=low
 

diff --git a/grml-live b/grml-live
index 41ab78a..56b423c 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -225,7 +225,7 @@ specify it on the command line using the -o option."
 
 # trim characters that are known to cause problems inside $GRML_NAME;
 # for example isolinux does not like '-' inside the directory name
-[ -n "$GRML_NAME" ] && export GRML_NAME="$(echo $GRML_NAME | tr -d ',./;\- ')"
+[ -n "$GRML_NAME" ] && export SHORT_GRML_NAME="$(echo $GRML_NAME | tr -d ',./;\- ')"
 # }}}
 
 # clean/zero grml-live logfile {{{
@@ -447,7 +447,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       # booting stuff:
       [ -d "$BUILD_OUTPUT"/boot/addons   ] || mkdir -p "$BUILD_OUTPUT"/boot/addons
       [ -d "$BUILD_OUTPUT"/boot/isolinux ] || mkdir -p "$BUILD_OUTPUT"/boot/isolinux
-      [ -d "$BUILD_OUTPUT"/boot/"${GRML_NAME}" ] || mkdir -p "$BUILD_OUTPUT"/boot/"${GRML_NAME}"
+      [ -d "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}" ] || mkdir -p "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}"
 
       cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest
 
@@ -455,7 +455,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       # during build, so check for the file:
       INITRD="$(ls $CHROOT_OUTPUT/boot/initrd* 2>/dev/null| grep -v '.bak$' | sort -r | head -1)"
       if [ -n "$INITRD" ] ; then
-         cp $INITRD "$BUILD_OUTPUT"/boot/"${GRML_NAME}"/initrd.gz
+         cp $INITRD "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}"/initrd.gz
          find $CHROOT_OUTPUT/boot/ -name initrd\*.bak -exec rm {} \;
       else
          log "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting"
@@ -465,7 +465,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
 
       KERNEL_IMAGE="$(ls $CHROOT_OUTPUT/boot/vmlinuz* 2>/dev/null | sort -r | head -1)"
       if [ -n "$KERNEL_IMAGE" ] ; then
-         cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/"${GRML_NAME}"/linux26
+         cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}"/linux26
       else
          log "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting"
          eerror "No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1
@@ -506,14 +506,22 @@ 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/%GRML_NAME%/$SHORT_GRML_NAME"  "$BUILD_OUTPUT"/boot/isolinux/isolinux.cfg
+      sed -i "s/%GRML_NAME%/$SHORT_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
 
       sed -i "s/%VERSION%/$VERSION/"           "$BUILD_OUTPUT"/boot/grub/menu.lst
-      sed -i "s/%GRML_NAME%/$GRML_NAME/"       "$BUILD_OUTPUT"/boot/grub/menu.lst
+      sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME"  "$BUILD_OUTPUT"/boot/grub/menu.lst
+
+      # make sure the squashfs filename is set accordingly:
+      GRML_NAME_SQUASHFS="$GRML_NAME.squashfs"
+      sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg
+
+      GRML_NAME_SQUASHFS="$(cut_string 40 "$GRML_NAME_SQUASHFS")"
+      GRML_NAME_SQUASHFS="$(extend_string_end 40 "$GRML_NAME_SQUASHFS")"
+      sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/f4
 
       # autostart for Windows:
       if [ -d "${TEMPLATE_DIRECTORY}/windows/autostart/" ] ; then

diff --git a/templates/boot/isolinux/f3 b/templates/boot/isolinux/f3
index 6dbbc60..9fa5822 100644 (file)
--- a/templates/boot/isolinux/f3
+++ b/templates/boot/isolinux/f3
@@ -7,7 +7,6 @@
  fb1280x1024, fb1024x768 or fb800x600   use framebuffer mode (e.g. notebooks)  
  nofb                                                disable framebuffer mode  
  hd / hd1 / hd2 / hd3 / floppy       boot from (1st/2nd/..) harddisk / floppy  
- floppy                                            boot from local floppydisk  
  failsafe                                use (nearly) no hardware recognition  
  serial                                               activate serial console  
  forensic              do not touch any harddisks during hardware recognition  
@@ -16,6 +15,7 @@
  dos                                                        start FreeDOS 1.0  
  qemu                               boot with special options for use in Qemu  
  vmware                           boot with special options for use in VMware  
+ grml2ram                               copy to RAM to RAM and run from there  
                                                                                
  A list with all supported boot options can be found on the CD at              
  /cdrom/GRML/grml-cheatcodes.txt                                               

diff --git a/templates/boot/isolinux/f4 b/templates/boot/isolinux/f4
index d57aa68..34f21e9 100644 (file)
--- a/templates/boot/isolinux/f4
+++ b/templates/boot/isolinux/f4
@@ -15,9 +15,9 @@
  grml noeject noprompt      do not eject CD after halt / do not prompt for it  
  grml swspeak               prepare system for use with software synthesizer,  
                                            run "swspeak" after booting system  
+ grml toram                 copy the whole CD/media to RAM and run from there  
+ grml toram=%GRML_NAME_SQUASHFS%            copy only specified squashfs file  
+                                                    to RAM and run from there  
  grml vga=ask  / vga=791            prompt for framebuffer menu / set options  
                                                                                
- Note: If you want to boot via USB/Firewire and accessing the device does not  
- work try to boot with 'grml scandelay' which adds a delay of a few seconds.   
-                                                                               
 \ f1f

diff --git a/templates/boot/isolinux/f5 b/templates/boot/isolinux/f5
index 5f3f76c..d994bc4 100644 (file)
--- a/templates/boot/isolinux/f5
+++ b/templates/boot/isolinux/f5
@@ -9,7 +9,6 @@
  grml myconfig=/dev/fd0              load configuration from specified device  
  grml home=/dev/sda1                   use specified device as home directory  
  grml testcd                              check CD data integrity and md5sums  
- grml toram                                 copy CD to RAM and run from there  
  grml services=foo1[,foo2] start specified service(s) [/etc/init.d/name foo1]  
  grml noautoconfig               disable searching for device labeled GRMLCFG  
  grml noswraid                       disable search for software RAID devices  
@@ -20,4 +19,5 @@
                 copy /etc/network then to local system and restart networking  
                                                                                
  A list with all supported boot options: /cdrom/GRML/grml-cheatcodes.txt       
+                                                                               
 \ f1f

diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg
index 7ec24fd..947bd31 100644 (file)
--- a/templates/boot/isolinux/syslinux.cfg
+++ b/templates/boot/isolinux/syslinux.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=/boot/%GRML_NAME%/initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
 # DEFAULT menu.c32
 TIMEOUT 300
 # ONTIMEOUT chain.32 hd0 0
@@ -27,64 +27,64 @@ MENU TITLE grml - Boot Menu
 LABEL grml
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
-KERNEL /boot/%GRML_NAME%/linux26
-APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
+KERNEL linux26
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL grml2ram
 MENU LABEL grml2ram - Copy Squashfs file to RAM
 MENU DEFAULT
-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
+KERNEL linux26
+APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL splash
 MENU LABEL grml - Bootsplash
-KERNEL /boot/%GRML_NAME%/linux26
-APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live splash nomce
+KERNEL linux26
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live splash nomce
 
 LABEL grml2hd
 MENU LABEL grml2hd
-KERNEL /boot/%GRML_NAME%/linux26
-APPEND apm=power-off lang=us quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
+KERNEL linux26
+APPEND apm=power-off lang=us quiet initrd=initrd.gz boot=live nomce
 
 LABEL debian2hd
 MENU LABEL debian2hd
-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
+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 /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
+KERNEL linux26
+APPEND apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
 
 LABEL bootchart
 MENU LABEL bootchart
-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
+KERNEL linux26
+APPEND init=/sbin/bootchartd apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL vmware
 MENU LABEL vmware
-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
+KERNEL linux26
+APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL qemu
 MENU LABEL qemu
-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
+KERNEL linux26
+APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu
 
 LABEL grmlx
 MENU LABEL grmlx
-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
+KERNEL linux26
+APPEND apm=power-off lang=us startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL nofb
 MENU LABEL grml without framebuffer
-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
+KERNEL linux26
+APPEND apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
 
 LABEL linux26
 MENU LABEL linux26
-KERNEL /boot/%GRML_NAME%/linux26
-APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
+KERNEL linux26
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL memtest
 MENU LABEL memtest
@@ -93,28 +93,28 @@ APPEND BOOT_IMAGE=memtest
 
 LABEL fb1280x1024
 MENU LABEL fb1280x1024
-KERNEL /boot/%GRML_NAME%/linux26
-APPEND apm=power-off lang=us vga=794 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
+KERNEL linux26
+APPEND apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce
 
 LABEL fb1024x768
 MENU LABEL fb1024x768
-KERNEL /boot/%GRML_NAME%/linux26
-APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
+KERNEL linux26
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL fb800x600
 MENU LABEL fb800x600
-KERNEL /boot/%GRML_NAME%/linux26
-APPEND apm=power-off lang=us vga=788 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
+KERNEL linux26
+APPEND apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce
 
 LABEL failsafe
 MENU LABEL failsafe
-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
+KERNEL 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
 
 LABEL forensic
 MENU LABEL forensic
-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
+KERNEL linux26
+APPEND vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live
 
 LABEL grub
 MENU LABEL grub
@@ -128,11 +128,11 @@ APPEND initrd=/boot/addons/balder10.imz
 
 LABEL serial
 MENU LABEL serial
-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
+KERNEL linux26
+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
 MENU HIDE
-KERNEL /boot/%GRML_NAME%/linux26
+KERNEL linux26
 APPEND ###############################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################