[SCM] live-helper branch, debian-next, updated. debian/2.0_a15-1-10-g67a9a09

[Richard Nelson]

The following commit has been merged in the debian-next branch:
commit 67a9a09b03e0606057f35442c1a03e324caecd9f
Author: Richard Nelson <unixabg at gmail.com>
Date:   Tue Jun 22 19:37:14 2010 -0500

    Added : and / to LH_BOOTAPPEND for live-config.hooks calls.

diff --git a/cgi/cgi b/cgi/cgi
index 6d0d9de..f10feda 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -79,7 +79,7 @@ else
 
 	# Advanced binary options
 	LH_BINARY_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1)
-	LH_BOOTAPPEND=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend=[-0-9a-zA-Z. _+=]+' | cut -f2- -d '=' | head -n1)
+	LH_BOOTAPPEND=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
 	LH_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1)
 	LH_DEBIAN_INSTALLER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1)
 	LH_ENCRYPTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])encryption=[0-9,a-z,A-Z]+' | cut -f 2 -d '=' | head -n1)
@@ -142,7 +142,7 @@ else
 	    -e "s/LH_SYMLINKS/${LH_SYMLINKS}/" \
 	    -e "s/LH_SYSVINIT/${LH_SYSVINIT}/" \
 	    -e "s/LH_BINARY_INDICES/${LH_BINARY_INDICES}/" \
-	    -e "s/LH_BOOTAPPEND/${LH_BOOTAPPEND}/" \
+	    -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" \
 	    -e "s/LH_BOOTLOADER/${LH_BOOTLOADER}/" \
 	    -e "s/LH_DEBIAN_INSTALLER/${LH_DEBIAN_INSTALLER}/" \
 	    -e "s/LH_ENCRYPTION/${LH_ENCRYPTION}/" \

-- 
live-helper