From a67febf7001e9d0071ef9c2014a2272cb3f40e09 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 13 Sep 2012 15:13:33 +0200 Subject: [PATCH] New persistency mode is used via boot option "persistence" instead of "persistent" --- templates/GRML/grml-cheatcodes.txt | 2 +- templates/boot/grub/%SHORT_NAME%_options.cfg | 4 ++-- templates/boot/isolinux/grml.cfg | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt index d652778..280f9de 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 0c5d4a0..595fddf 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 persistency 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 ce0819e..daea766 100644 --- a/templates/boot/isolinux/grml.cfg +++ b/templates/boot/isolinux/grml.cfg @@ -94,10 +94,10 @@ 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 -- 2.1.4