diff options
| author | Richard Nelson <unixabg@gmail.com> | 2010-06-22 19:37:14 -0500 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:12 +0100 |
| commit | 423b192d8b938dd21bcc20525ace1cebd8bd6699 (patch) | |
| tree | 80c939c2d5853abfdd43c2133e233a7aeeb8382b /cgi | |
| parent | f374ab97c7d0f6878bd75d5718b60ad05ad740e3 (diff) | |
| download | vyos-live-build-423b192d8b938dd21bcc20525ace1cebd8bd6699.tar.gz vyos-live-build-423b192d8b938dd21bcc20525ace1cebd8bd6699.zip | |
Added : and / to LH_BOOTAPPEND for live-config.hooks calls.
Diffstat (limited to 'cgi')
| -rwxr-xr-x | cgi/cgi | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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}/" \ |