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

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 2d46acc..2e142f0 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -16,7 +16,7 @@ label debug
 label nofb
   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 nomodeset nomce 
+  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 nomodeset nomce 
 
   text help
                                         Boot Grml without framebuffer.
@@ -25,7 +25,7 @@ label nofb
 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 
+  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 nomodeset nomce vga=791 
 
   text help
                                         Boot Grml without KMS (Kernel
@@ -50,13 +50,13 @@ label ssh
 label forensic
   menu label %GRML_NAME% - 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 vga=791 forensic nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect readonly 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off nomce 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
-                                        forces all blockdevices to readonly
+                                        forces all blockdevices to read-only
                                         mode.
   endtext
 
@@ -103,8 +103,9 @@ label persistence
                                         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.
+                                        with label persistence or
+                                        (deprecated) full-ov, custom-ov,
+                                        live-rw or home-rw.
   endtext
 
 label serial