diff options
| author | Richard Nelson <unixabg@gmail.com> | 2010-06-22 19:19:44 -0500 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:11 +0100 |
| commit | f374ab97c7d0f6878bd75d5718b60ad05ad740e3 (patch) | |
| tree | 5770adcb2ac8b34b647175dbc7229764c122df13 | |
| parent | 3558eb0286c0d273721db3f93d334ca614e98b24 (diff) | |
| download | vyos-live-build-f374ab97c7d0f6878bd75d5718b60ad05ad740e3.tar.gz vyos-live-build-f374ab97c7d0f6878bd75d5718b60ad05ad740e3.zip | |
Cleaned up expression LH_BOOTAPPEND and included = for live-config calls.
| -rwxr-xr-x | cgi/cgi | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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) |