Enable systemd specific debug boot options in debugging mode

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

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 4ca3f15..dd19d4d 100644 (file)
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -3,9 +3,9 @@
 # generic ones
 
 label debug
 # generic ones
 
 label debug

-  menu label %GRML_NAME% - Debug Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 verbose debug=vc debug initcall_debug nomce 
+  menu label %GRML_NAME% - ^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
                                         Boot Grml in debug mode, which
 
   text help
                                         Boot Grml in debug mode, which


@@ -14,67 +14,65 @@ label debug
   endtext
 
 label nofb
   endtext
 
 label nofb

-  menu label %GRML_NAME% - Disable Framebuffer
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal quiet nomce 
+  menu label %GRML_NAME% - 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
                                         Boot Grml without framebuffer.
   endtext
 
 
   text help
                                         Boot Grml without framebuffer.
   endtext
 

-label lang-de
-  menu label %GRML_NAME% - Enable SSH (with random password)
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce ssh
+label nokms
+  menu label %GRML_NAME% - Disable ^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
 
   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).
+                                        Boot Grml without KMS (Kernel
+                                        Mode Setting).

   endtext
 
   endtext
 

-label failsafe
-  menu label %GRML_NAME% - ^Failsafe Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi 
+label ssh
+  menu label %GRML_NAME% - 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 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.
+                                        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
 
 label forensic
   menu label %GRML_NAME% - F^orensic Mode
   endtext
 
 label forensic
   menu label %GRML_NAME% - F^orensic Mode

-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off nomce vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet 
+  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 nodmraid 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
 
 label lang-de
                                         mode.
   endtext
 
 label lang-de

-  menu label %GRML_NAME% - German Settings
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce lang=de 
+  menu label %GRML_NAME% - ^German Settings
+  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
                                         Boot Grml with german settings.
   endtext
 
 label %GRML_NAME%x
 
   text help
                                         Boot Grml with german settings.
   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 apm=power-off quiet nomce startx=wm-ng 
+  menu label %GRML_NAME% - 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
 
   text help
                                         Boot Grml and automatically invoke


@@ -83,8 +81,8 @@ label %GRML_NAME%x
 
 label grml2ram
   menu label %GRML_NAME% - Load to ^RAM
 
 label grml2ram
   menu label %GRML_NAME% - Load to ^RAM

-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce toram=%SQUASHFS_NAME% 
+  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
                                         Load Grml into the memory (RAM).
 
   text help
                                         Load Grml into the memory (RAM).


@@ -96,14 +94,26 @@ label grml2ram
                                         to use this option.
   endtext
 
                                         to use this option.
   endtext
 

+label persistence
+  menu label %GRML_NAME% - ^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 serial
 label serial

-  menu label %GRML_NAME% - Serial Console
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal video=vesafb:off quiet nomce console=tty1 console=ttyS0,9600n8 
+  menu label %GRML_NAME% - 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,9600n8 

 
 
   text help
 
 
   text help

-                                        Activate ttyS0 and start mgetty.
+                                        Activate ttyS0 and start a getty.

   endtext
 
 # back to main menu
   endtext
 
 # back to main menu