[SCM] live-config branch, debian-next, updated. debian/3.0_a36-1-9-g0ea04f2

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 0ea04f2ac586a9a5a2abe2ce1503ab4609767003
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Apr 8 18:31:08 2012 +0200

    Using 'persistence' (noun) rather than 'persistent' (adjective/adverb) everywhere.

diff --git a/bin/boot-init.sh b/bin/boot-init.sh
index a0cc1f2..d560053 100755
--- a/bin/boot-init.sh
+++ b/bin/boot-init.sh
@@ -84,7 +84,7 @@ device_is_USB_flash_drive()
 
 log_begin_msg "live-boot: resyncing snapshots and caching reboot files..."
 
-if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline
+if ! grep -qs nopersistence /proc/cmdline && grep -qs persistence /proc/cmdline
 then
 	# ROOTSNAP and HOMESNAP are defined in ${SNAPSHOT_CONF} file
 	if [ ! -z "${ROOTSNAP}" ]

-- 
live-config