Update bootsplashes f3, f4 and f5

diff --git a/debian/changelog b/debian/changelog
index 28ab5e7..0592da4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ 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.
+  * Update bootsplashes to current implementation, based on
+    live-initramfs and grml-autoconfig.
 
  -- Michael Prokop <mika@grml.org>  Wed, 20 Feb 2008 16:41:06 +0100
 

diff --git a/templates/boot/isolinux/f3 b/templates/boot/isolinux/f3
index 9fa5822..8a7dd14 100644 (file)
--- a/templates/boot/isolinux/f3
+++ b/templates/boot/isolinux/f3
@@ -18,6 +18,6 @@
  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                                               
+ /live/image/GRML/grml-cheatcodes.txt                                          
                                                                                
 \ f1f

diff --git a/templates/boot/isolinux/f4 b/templates/boot/isolinux/f4
index 34f21e9..320d0e5 100644 (file)
--- a/templates/boot/isolinux/f4
+++ b/templates/boot/isolinux/f4
@@ -2,22 +2,22 @@
                                                                                
 \ f70 The following options can be used at the boot:-prompt. [1/2]                  
                                                                                
- grml nousb nousb2           disable initialization of USB in initial ramdisk  
- grml nofirewire        disable initialization of firewire in initial ramdisk  
- grml scandelay[=seconds]    delay accessing ISO-device (useful on usb-stick)  
- grml scsi=modulename              load specified SCSI module (don't add .ko)  
- grml scsi=probe                         autoprobe all available scsi modules  
- grml scsi=ask                              prompt for loading of SCSI module  
- grml blacklist=modulename     completely disable loading of specified module  
- grml no{fstab|swap|apm|apic|acpi|scsi|sound}       disable specified feature  
- grml nodma ide=nodma            disable DMA accelleration for ALL IDE-drives  
- grml noudev                          disable startup of udev (use with care)  
+ grml blacklist=firewire-core               disable new (Juju) firewire stack  
+ grml blacklist=ieee1394                           disable old firewire stack  
+ grml blacklist=ipw3945,prism54                     disable specified drivers  
+ grml blacklist=module1[,module2]  disable loading of specified module, e.g.:  
+ grml blacklist=usbcore                                   disable USB drivers  
+ grml debnet        search local partitions for file /etc/network/interfaces,  
+                copy /etc/network then to local system and restart networking  
+ grml gmt tz=Europe/Vienna   use GMT-based time and specified timezone for TZ  
+ grml home=/dev/sda1                   use specified device as home directory  
+ grml keyboard=de xkeyboard=de                                   set keyboard  
+ grml lang=[at|ch|da|de|es|fr|it|...|us]       set keyboard + language (UTF8)  
+ grml lang=[at|ch|da|de|es|fr|it|...|us]-iso   set keyboard + language  (ISO)  
+ grml myconfig=/dev/fd0              load configuration from specified device  
+ grml noautoconfig               disable searching for device labeled GRMLCFG  
+ grml nodhcp                     disable searching for network setup via DHCP  
  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  
+ grml nofstab / nolabel   disable generating of /etc/fstab / use of fs-labels  
                                                                                
 \ f1f

diff --git a/templates/boot/isolinux/f5 b/templates/boot/isolinux/f5
index d994bc4..e697b5d 100644 (file)
--- a/templates/boot/isolinux/f5
+++ b/templates/boot/isolinux/f5
@@ -2,22 +2,22 @@
                                                                                
 \ f70 The following options can be used at the boot:-prompt. [2/2]                  
                                                                                
- grml lang=at|ch|da|de|es|fr|it|nl|pl|...|us[-utf8]   set keyboard + language  
- grml keyboard=de xkeyboard=de                                   set keyboard  
- grml gmt tz=Europe/Vienna   use GMT-based time and specified timezone for TZ  
- grml ssh=password            set password for user grml and start ssh-server  
- 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 services=foo1[,foo2] start specified service(s) [/etc/init.d/name foo1]  
- grml noautoconfig               disable searching for device labeled GRMLCFG  
+ grml nolvm                          disable search for Logical Volumes (LVM)  
  grml noswraid                       disable search for software RAID devices  
- grml nofstab / nolabel   disable generating of /etc/fstab / use of fs-labels  
- grml nodhcp                     disable searching for network setup via DHCP  
+ grml noudev                disable startup of udev (disables module loading)  
+ grml services=foo1[,foo2] start specified service(s) [/etc/init.d/name foo1]  
+ grml ssh=password            set password for user grml and start ssh-server  
  grml startx[=windowmanager]   autostart X.org via grml-x (default WM: wm-ng)  
- grml debnet        search local partitions for file /etc/network/interfaces,  
-                copy /etc/network then to local system and restart networking  
+ grml swap                                   activate present swap partitions  
+ grml testcd                              check CD data integrity and md5sums  
+ 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  
+                                                                               
                                                                                
- A list with all supported boot options: /cdrom/GRML/grml-cheatcodes.txt       
+ A list with all supported boot options: /live/image/GRML/grml-cheatcodes.txt  
                                                                                
 \ f1f