From 9dc2a44a4f884dd4a10c0e1e638decb49127352c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 13 Jan 2012 15:46:00 +0100 Subject: [PATCH] persistency feature: do not use persistent=nofiles any longer This feature was removed in git commit 5d975eaa4e1bc4094c8d3cca3e9e1087dc0d061b ("Removing now obsolete persistent=* arguments.") of live-boot without providing any backwards compatibility, so the persistency feature is broken if we don't remove the nofiles argument. --- templates/GRML/grml-cheatcodes.txt | 4 +--- templates/boot/grub/%SHORT_NAME%_options.cfg | 2 +- templates/boot/isolinux/grml.cfg | 10 +++++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt index 9fe0ff9..11a2821 100644 --- a/templates/GRML/grml-cheatcodes.txt +++ b/templates/GRML/grml-cheatcodes.txt @@ -63,10 +63,8 @@ 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=nofiles Enable persistency feature, more details available at +grml persistent Enable persistency feature, more details available at http://wiki.grml.org/doku.php?id=persistency - Notice that the "=nofiles" argument is optional, though recommended - as default setting. grml hostname=... Set hostname to given argument grml hostname Set a random hostname [Note: only available with releases newer than 2010.04] diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg index e7b917d..c563be6 100644 --- a/templates/boot/grub/%SHORT_NAME%_options.cfg +++ b/templates/boot/grub/%SHORT_NAME%_options.cfg @@ -2,7 +2,7 @@ submenu "%GRML_NAME% - advanced options ->" --class=submenu { menuentry "%GRML_NAME% - enable persistent 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=nofiles + linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg index a295d43..1177733 100644 --- a/templates/boot/isolinux/grml.cfg +++ b/templates/boot/isolinux/grml.cfg @@ -96,13 +96,13 @@ label grml2ram label persistent 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=nofiles + append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 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. + Boot Grml and enable persistency + feature to store system and + settings on an external device + with label live-rw / home-rw. endtext label serial -- 2.1.4