manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Richard Nelson 2010-06-22 19:37:14 -05:00 committed by Daniel Baumann
parent f374ab97c7
commit 423b192d8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cgi/cgi
View File

@ -79,7 +79,7 @@ else
# Advanced binary options # Advanced binary options
LH_BINARY_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1) 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_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_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) 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_SYMLINKS/${LH_SYMLINKS}/" \
-e "s/LH_SYSVINIT/${LH_SYSVINIT}/" \ -e "s/LH_SYSVINIT/${LH_SYSVINIT}/" \
-e "s/LH_BINARY_INDICES/${LH_BINARY_INDICES}/" \ -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_BOOTLOADER/${LH_BOOTLOADER}/" \
-e "s/LH_DEBIAN_INSTALLER/${LH_DEBIAN_INSTALLER}/" \ -e "s/LH_DEBIAN_INSTALLER/${LH_DEBIAN_INSTALLER}/" \
-e "s/LH_ENCRYPTION/${LH_ENCRYPTION}/" \ -e "s/LH_ENCRYPTION/${LH_ENCRYPTION}/" \