X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fgrml.cfg;h=2d46accdff72654dab6baf3976df079cee5a74b6;hp=c63dd0a99f032297464bd7b83731eb466a0873ab;hb=2897f72984ecc2d44be42d6a5a76973131a4eeed;hpb=d9346434d30304e524184dba98e3e17b35461bc0

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index c63dd0a..2d46acc 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -4,8 +4,8 @@
 
 label debug
   menu label %GRML_NAME% - ^Debug Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=791 verbose debug=vc debug initcall_debug nomce 
+  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 
 
   text help
                                         Boot Grml in debug mode, which
@@ -15,44 +15,42 @@ label debug
 
 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% bootfrom=removable apm=power-off vga=normal quiet nomce 
+  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 nomodeset nomce 
 
   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 bootid=%BOOTID% bootfrom=removable 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 nomodeset nomce vga=791 
 
   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
 
-label failsafe
-  menu label %GRML_NAME% - ^Failsafe Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable 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 ssh 
 
   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
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable 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 vga=791 forensic nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect readonly 
 
   text help
                                         Boot Grml in forensic mode. This
@@ -64,8 +62,8 @@ label forensic
 
 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% bootfrom=removable apm=power-off vga=791 quiet nomce lang=de 
+  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 lang=de 
 
   text help
                                         Boot Grml with german settings.
@@ -73,8 +71,8 @@ label lang-de
 
 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% bootfrom=removable apm=power-off quiet nomce startx=wm-ng 
+  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 startx 
 
   text help
                                         Boot Grml and automatically invoke
@@ -83,8 +81,8 @@ label %GRML_NAME%x
 
 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% bootfrom=removable 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 toram=%SQUASHFS_NAME% 
 
   text help
                                         Load Grml into the memory (RAM).
@@ -96,14 +94,27 @@ label grml2ram
                                         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 persistence 
+
+  text help
+                                        Boot Grml and enable persistency
+                                        feature to store system and
+                                        settings on an external device
+                                        with label full-ov, custom-ov or
+                                        (deprecated) live-rw / home-rw.
+  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% bootfrom=removable apm=power-off vga=normal video=vesafb:off quiet nomce noquick console=tty1 console=ttyS0,9600n8 
+  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 console=tty1 console=ttyS0,9600n8 
 
 
   text help
-                                        Activate ttyS0 and start mgetty.
+                                        Activate ttyS0 and start a getty.
   endtext
 
 # back to main menu