X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fgrml.cfg;h=a3db2a406383b00f9bc8520010df50a7824d9d95;hp=936fd2db51fdedc3cfaa931829b142ac90c2231a;hb=94aafe9bb2f3;hpb=f1d811084da5ed53cd5a3c2c22457d0d605effe2

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 936fd2d..a3db2a4 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 mgag200.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 mgag200.modeset=0 nomodeset nomce vga=791 
 
   text help
                                         Boot Grml without KMS (Kernel
@@ -40,22 +40,23 @@ label ssh
   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).
+                                        '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%/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
 
@@ -93,16 +94,16 @@ label grml2ram
                                         to use this option.
   endtext
 
-label persistent
-  menu label %GRML_NAME% - ^Persistent mode
+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 persistent 
+  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 live-rw / home-rw.
+                                        with label persistence.
   endtext
 
 label serial