From 968b91fb2e4d4f834eb01a8aa2e5b969799d36af Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@grml.org>
Date: Tue, 14 Aug 2012 10:01:03 +0200
Subject: [PATCH] =?UTF-8?q?persistent=20=E2=86=92=20persistence=20update?=
 =?UTF-8?q?=20due=20to=20changes=20in=20live-boot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the option was renamed in live-boot 3.0~a27
update cheatcodes and boot configs accordingly
---
 templates/GRML/grml-cheatcodes.txt           | 2 +-
 templates/boot/grub/%SHORT_NAME%_options.cfg | 4 ++--
 templates/boot/isolinux/grml.cfg             | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index d6527784..280f9def 100644
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -63,7 +63,7 @@ grml file=foobar.tbz                Use specified file as name for configuration
                                     instead of the default one (config.tbz)
 grml extract=/etc                   Extract only /etc from configuration archive,
                                     use it in combination with myconfig or netconfig
-grml persistent                     Enable persistency feature, more details available at
+grml persistence                    Enable persistency feature, more details available at
                                     http://wiki.grml.org/doku.php?id=persistency
 grml hostname=...                   Set hostname to given argument
 grml hostname                       Set a random hostname
diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg
index 0c5d4a05..d5b00ef9 100644
--- a/templates/boot/grub/%SHORT_NAME%_options.cfg
+++ b/templates/boot/grub/%SHORT_NAME%_options.cfg
@@ -1,8 +1,8 @@
 submenu "%GRML_NAME% - advanced options  ->" --class=submenu {
-menuentry "%GRML_NAME% - enable persistent mode" {
+menuentry "%GRML_NAME% - enable persistence 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}" persistent 
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistence 
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index ce0819ec..d1e99c70 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -94,16 +94,17 @@ label grml2ram
                                         to use this option.
   endtext
 
-label persistent
+label persistence
   menu label %GRML_NAME% - ^Persistent 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 custom-ov or
+                                        (deprecated) live-rw / home-rw.
   endtext
 
 label serial