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

[Richard Nelson]

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

    Cleaned up expression LH_BOOTAPPEND and included = for live-config calls.

diff --git a/cgi/cgi b/cgi/cgi
index dbccf72..6d0d9de 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -46,9 +46,10 @@ else
 	# Converting ';':	sed 's/%3B/\;/g'
 	# Converting '/':	sed 's/%2F/\//g'
 	# Converting '~':	sed 's/%7E/\~/g'
+	# Converting '=':	sed 's/%3D/=/g'
 
 	# Translate parameters
-	QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g')
+	QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g')
 	# Debug the filtering string
 	# echo ${QUERY_STRING}
 
@@ -78,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-9,a-z,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_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)

-- 
live-helper