Merge remote-tracking branch 'origin/github/pr/148'

[grml-live.git] / templates / boot / isolinux / grml.cfg

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 286d708..b940f01 100644 (file)
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -2,125 +2,141 @@
 
 # generic ones
 
 
 # generic ones
 

-label debug
-  menu label %GRML_NAME% - ^Debug Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 verbose debug=vc initcall nomce 
+label pnet
+  menu label Enable Predictable ^Network Interface Names
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce 

 
   text help
 
   text help

-                                        Boot Grml in debug mode, which
-                                        activates debug shells during
-                                        bootup sequence.
+                                        Boot Grml with Predictable Network
+                                        Interface Names.

   endtext
 
   endtext
 

-label nofb
-  menu label %GRML_NAME% - Dis^able Framebuffer
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal quiet nomce 
+label ssh
+  menu label Enable ^SSH (with random password)
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce net.ifnames=0 ssh 

 
   text help
 
   text help

-                                        Boot Grml without framebuffer.
+                                        Boot Grml and automatically start
+                                        SSH Server. The password for user
+                                        'grml' and 'root' will be set to
+                                        a random password, unless you add
+                                        an option to the ssh argument in
+                                        the command line (for example:
+                                        ssh=secret).

   endtext
 
   endtext
 

-label nokms
-  menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset quiet nomce 
+label grml2ram
+  menu label Load Grml to ^RAM
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce net.ifnames=0 toram=%SQUASHFS_NAME% 

 
   text help
 
   text help

-                                        Boot Grml without KMS (Kernel
-                                        Mode Setting).
+                                        Load Grml into RAM.
+                                        This allows you to remove the Grml
+                                        media after Grml finished booting.
+
+                                        Note: you should have enough RAM
+                                        (>= size of ISO * 1.2) to be able
+                                        to use this option.

   endtext
 
   endtext
 

-label ssh
-  menu label %GRML_NAME% - Enable ^SSH (with random password)
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ssh
+label grmlmedium2ram
+  menu label Load ^whole medium to RAM
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce net.ifnames=0 toram 

 
   text help
 
   text help

-                                        Boot Grml and automatically start
-                                        SSH Server. The password for user
-                                        'grml' will be set to a random
-                                        password, unless you add an option
-                                        to the ssh argument in the command
-                                        line (for example: ssh=secret).
-  endtext
+                                        Load whole medium into RAM.
+                                        This allows you to remove the Grml
+                                        media after Grml has finished booting,
+                                        and also to access the rest of the
+                                        media.

 
 

-label failsafe
-  menu label %GRML_NAME% - ^Failsafe Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid nolvm noswap raid=noautodetect nodhcp 
-  text help
-                                        Boot Grml in failsafe mode, which
-                                        disables any hardware recognition
-                                        that might prevent your system from
-                                        booting. If Grml does not boot in
-                                        default mode try using this option.
+                                        Note: you should have enough RAM
+                                        (>= size of ISO * 1.2) to be able
+                                        to use this option.

   endtext
 
 label forensic
   endtext
 
 label forensic

-  menu label %GRML_NAME% - F^orensic Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet 
+  menu label F^orensic Mode
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off nomce net.ifnames=0 vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect read-only 

 
   text help
                                         Boot Grml in forensic mode. This
                                         mode prevents touching any harddisks
                                         during hardware recognition and
 
   text help
                                         Boot Grml in forensic mode. This
                                         mode prevents touching any harddisks
                                         during hardware recognition and

-                                        forces all blockdevices to readonly
+                                        forces all blockdevices to read-only

                                         mode.
   endtext
 
                                         mode.
   endtext
 

+label persistence
+  menu label ^Persistency mode
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce net.ifnames=0 persistence 
+
+  text help
+                                        Boot Grml and enable persistency
+                                        feature to store system and
+                                        settings on an external device
+                                        with label persistence.
+  endtext
+

 label lang-de
 label lang-de

-  menu label %GRML_NAME% - ^German Settings
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce lang=de 
+  menu label Load ^German Keyboard Layout
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce net.ifnames=0 lang=de 

 
   text help
 
   text help

-                                        Boot Grml with german settings.
+                                        Boot Grml with German keyboard layout.

   endtext
 
 label %GRML_NAME%x
   endtext
 
 label %GRML_NAME%x

-  menu label %GRML_NAME% - Graphical ^Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off quiet nomce startx=wm-ng 
+  menu label Graphical ^Mode
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce net.ifnames=0 startx 

 
   text help
                                         Boot Grml and automatically invoke
                                         grml-x to start X Window System.
   endtext
 
 
   text help
                                         Boot Grml and automatically invoke
                                         grml-x to start X Window System.
   endtext
 

-label grml2ram
-  menu label %GRML_NAME% - Load to ^RAM
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce toram=%SQUASHFS_NAME% 
+label nofb
+  menu label Dis^able Framebuffer
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=normal radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset nomce net.ifnames=0 

 
   text help
 
   text help

-                                        Load Grml into the memory (RAM).
-                                        This allows you to remove the Grml
-                                        media after Grml finished booting.
+                                        Boot Grml without framebuffer.
+  endtext

 
 

-                                        Note: you should have enough RAM
-                                        (>= size of ISO * 1.2) to be able
-                                        to use this option.
+label nokms
+  menu label Disable Video ^Kernel Mode Setting
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset nomce net.ifnames=0 vga=791 
+
+  text help
+                                        Boot Grml without Kernel Mode Setting
+                                        for various video drivers.

   endtext
 
   endtext
 

-label persistent
-  menu label %GRML_NAME% - ^Persistent mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce persistent 
+label debug
+  menu label ^Debug Mode
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 verbose debug=vc initcall nomce net.ifnames=0 systemd.log_level=debug systemd.log_target=kmsg log_buf_len=1M

 
   text help
 
   text help

-                                       Boot Grml and enable persistency
-                                       feature to store system and
-                                       settings on an external device
-                                       with label live-rw / home-rw.
+                                        Boot Grml in debug mode, which
+                                        activates debug shells during
+                                        bootup sequence.

   endtext
 
 label serial
   endtext
 
 label serial

-  menu label %GRML_NAME% - Serial ^Console
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off quiet nomce console=tty1 console=ttyS0,9600n8 
+  menu label Serial ^Console
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off nomce net.ifnames=0 console=tty1 console=ttyS0,115200n8 

 
 
   text help
 
 
   text help