[SCM] Debian Live initramfs hook branch, master, updated. 1.154.5-1-4-g5d2d0ba

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 5d2d0ba3ecafd40389b7671d41d19ec45123e1f9
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jan 22 17:39:39 2009 +0100

    Adding patch from Thierry Walrant <debian.tgc at walrant.net> to allow setting a path for the persistence files through persistent-path boot parameter (Closes: #512661).

diff --git a/scripts/live b/scripts/live
index d06dd20..bf90781 100755
--- a/scripts/live
+++ b/scripts/live
@@ -340,6 +340,11 @@ Arguments ()
 				export PERSISTENT
 				;;
 
+			persistent-path=*)
+				PERSISTENT_PATH="${ARGUMENT#persistent-path=}"
+				export PERSISTENT_PATH
+				;;
+
 			nopersistent)
 				NOPERSISTENT="Yes"
 				export NOPERSISTENT
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 8875248..8970834 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -299,6 +299,13 @@ find_cow_device ()
 	cow_backing="/${pers_label}-backing"
 	black_listed_devices="${2}"
 
+	if [ -z "${PERSISTENT_PATH}" ]
+	then
+		pers_fpath=${cow_backing}/${pers_label}
+	else
+		pers_fpath=${cow_backing}/${PERSISTENT_PATH}/${pers_label}
+	fi
+
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
 		for dev in $(subdevices "${sysblock}")
@@ -332,9 +339,9 @@ find_cow_device ()
 						break
 					fi
 
-					if [ -f "${cow_backing}/${pers_label}" ]
+					if [ -f "${pers_fpath}" ]
 					then
-						echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+						echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
 						return 0
 					else
 						umount ${cow_backing}

-- 
Debian Live initramfs hook