Add persistency feature to boot menu.

diff --git a/debian/changelog b/debian/changelog
index f5a47b4..54b1b92 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ grml-live (0.9.36) unstable; urgency=low
     arguments avoids displaying the executed code in the initramfs
     which is something you usually want to have enabled by default
     when debugging a system.
+  * Fix label name for ssh bootoption.
+  * Add persistency feature to boot menu. [Closes: issue773]
   * Software related changes:
     - Add grml-quickconfig to GRMLBASE.
     - Add grml-quickconfig-standard to GRML_* classes.
@@ -30,7 +32,7 @@ grml-live (0.9.36) unstable; urgency=low
     - Move grml-docs from GRMLBASE to GRML_{SMALL,MEDIUM,FULL} to be
       able to customize it easier.
 
- -- Michael Prokop <mika@grml.org>  Fri, 26 Feb 2010 12:22:08 +0100
+ -- Michael Prokop <mika@grml.org>  Fri, 26 Feb 2010 14:52:03 +0100
 
 grml-live (0.9.35) unstable; urgency=low
 

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 3f87dec..af95f47 100644 (file)
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -22,7 +22,7 @@ label nofb
                                         Boot Grml without framebuffer.
   endtext
 
-label lang-de
+label ssh
   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
@@ -95,6 +95,18 @@ label grml2ram
                                         to use this option.
   endtext
 
+label persistent
+  menu label %GRML_NAME% - ^Persistent mode
+  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 persistent 
+
+  text help
+                                       Boot Grml and enable persistency
+                                       feature to store system and
+                                       settings on an external device
+                                       with label live-rw / home-rw.
+  endtext
+
 label serial
   menu label %GRML_NAME% - Serial ^Console
   kernel /boot/%SHORT_NAME%/linux26

diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index e5284c1..d8ce23e 100644 (file)
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -48,6 +48,7 @@
 #   o = Forensic Mode
 #   g = German Settings
 #   m = Graphical Mode
+#   p = Persistent Mode
 #   r = Load to RAM
 #   c = Serial Console
 #