Rename "readonly" boot option to "read-only", renamed in live-boot

Upstream broke the "readonly" boot option by renaming
it to "read-only" in live-boot.git commit 5d6acf56. :(

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index 2b6c513..92cd354 100644 (file)
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -211,7 +211,7 @@ grml dmraid=on                      Automatically enable any present dmraid devi
 grml dmraid=off                     Actively try to stop any present dmraid devices.
 grml nolvm                          Disable scanning for Logical Volumes (LVM)
 grml lvm                            Automatically activate Logival Volumes (LVM) during boot
 grml dmraid=off                     Actively try to stop any present dmraid devices.
 grml nolvm                          Disable scanning for Logical Volumes (LVM)
 grml lvm                            Automatically activate Logival Volumes (LVM) during boot

-grml readonly                       Make sure all harddisk devices (/dev/hd* /dev/sd*) are forced to read-only mode
+grml read-only                      Make sure all harddisk devices (/dev/hd* /dev/sd*) are forced to read-only mode

 grml ethdevice=...                  Use specified network device for network boot instead of default (eth0)
 grml ethdevice-timeout=...          Use specified network configuration timeout instead of default (15sec)
 grml xmodule=ati|fbdev|i810|mga     Use specified X.org-Module (1)
 grml ethdevice=...                  Use specified network device for network boot instead of default (eth0)
 grml ethdevice-timeout=...          Use specified network configuration timeout instead of default (15sec)
 grml xmodule=ati|fbdev|i810|mga     Use specified X.org-Module (1)

diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg
index 595fddf..256ddd2 100644 (file)
--- a/templates/boot/grub/%SHORT_NAME%_options.cfg
+++ b/templates/boot/grub/%SHORT_NAME%_options.cfg
@@ -50,7 +50,7 @@ menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
 menuentry "%GRML_NAME% - forensic mode" {
     set gfxpayload=keep
     echo 'Loading kernel...'
 menuentry "%GRML_NAME% - forensic mode" {
     set gfxpayload=keep
     echo 'Loading kernel...'

-    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect 
+    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" read-only nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect 

     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 2d46acc..f5298d9 100644 (file)
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -50,13 +50,13 @@ label ssh
 label forensic
   menu label %GRML_NAME% - F^orensic Mode
   kernel /boot/%SHORT_NAME%/vmlinuz
 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 forensic 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
 
                                         mode.
   endtext