summaryrefslogtreecommitdiff
path: root/cgi
diff options
context:
space:
mode:
authorRichard Nelson <unixabg@gmail.com>2010-08-14 16:57:49 -0500
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:18 +0100
commit4ea3b7caf2cd6a6cb4334e6120c14920b2c62f36 (patch)
tree5b2c7d56b7f810b56ae2e902d6d3cee1b1b93ed9 /cgi
parentcb9ac8bef7c73cf1b42b7d2682f5d0ba95073ffc (diff)
downloadvyos-live-build-4ea3b7caf2cd6a6cb4334e6120c14920b2c62f36.tar.gz
vyos-live-build-4ea3b7caf2cd6a6cb4334e6120c14920b2c62f36.zip
Add param to cgi for --tasks.
Diffstat (limited to 'cgi')
-rwxr-xr-xcgi/cgi5
1 files changed, 4 insertions, 1 deletions
diff --git a/cgi/cgi b/cgi/cgi
index 66eded878..5a9e32f20 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -64,6 +64,7 @@ else
LH_BINARY_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1)
LH_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1)
LH_PACKAGES_LISTS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])packages_lists=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LH_TASKS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])tasks=[-0-9a-zA-Z. _]+' | cut -f 2 -d '=' | head -n1)
LH_PACKAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])packages=[-0-9a-zA-Z. _]+' | cut -f 2 -d '=' | head -n1)
# Advanced bootstrap options
@@ -132,6 +133,7 @@ else
-e "s/LH_BINARY_IMAGES/${LH_BINARY_IMAGES}/" \
-e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" \
-e "s/LH_PACKAGES_LISTS/${LH_PACKAGES_LISTS}/" \
+ -e "s/LH_TASKS/${LH_TASKS}/" \
-e "s/LH_PACKAGES/${LH_PACKAGES}/" \
-e "s/LH_ARCHITECTURE/${LH_ARCHITECTURE}/" \
-e "s/LH_BOOTSTRAP_FLAVOUR/${LH_BOOTSTRAP_FLAVOUR}/" \
@@ -181,6 +183,7 @@ REMOTE_ADDR="${REMOTE_ADDR}"
LH_BINARY_IMAGES="${LH_BINARY_IMAGES}"
LH_DISTRIBUTION="${LH_DISTRIBUTION}"
LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS}"
+LH_TASKS="${LH_TASKS}"
LH_PACKAGES="${LH_PACKAGES}"
# Advanced bootstrap options
@@ -225,7 +228,7 @@ LH_REPOSITORIES="${LH_REPOSITORIES}"
EOF
echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-helper.cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live
- echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-helper.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LH_BINARY_IMAGES}|distribution ${LH_DISTRIBUTION}|packages_lists ${LH_PACKAGES_LISTS}|packages ${LH_PACKAGES}|architecture ${LH_ARCHITECTURE}|mirror_bootstrap_security ${LH_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LH_MIRROR_BOOTSTRAP}|mirror_binary_security ${LH_MIRROR_BINARY_SECURITY}|mirror_binary ${LH_MIRROR_BINARY}|archive_areas ${LH_ARCHIVE_AREAS}|chroot_filesystem ${LH_CHROOT_FILESYSTEM}|linux_flavours ${LH_LINUX_FLAVOURS}|security ${LH_SECURITY}|symlinks ${LH_SYMLINKS}|sysvinit ${LH_SYSVINIT}|binary_indices ${LH_BINARY_INDICES}|bootappend_install ${LH_BOOTAPPEND_INSTALL}|bootappend_live ${LH_BOOTAPPEND_LIVE}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|iso_application ${LH_ISO_APPLICATION}|iso_preparer ${LH_ISO_PREPARER}|iso_publisher ${LH_ISO_PUBLISHER}|iso_volume ${LH_ISO_VOLUME}|memtest ${LH_MEMTEST}|net_path ${LH_NET_ROOT_PATH}|net_server ${LH_NET_ROOT_SERVER}|source_images ${LH_SOURCE_IMAGES}|source ${LH_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}\n" >> /var/log/live
+ echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-helper.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LH_BINARY_IMAGES}|distribution ${LH_DISTRIBUTION}|packages_lists ${LH_PACKAGES_LISTS}|tasks ${LH_TASKS}|packages ${LH_PACKAGES}|architecture ${LH_ARCHITECTURE}|mirror_bootstrap_security ${LH_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LH_MIRROR_BOOTSTRAP}|mirror_binary_security ${LH_MIRROR_BINARY_SECURITY}|mirror_binary ${LH_MIRROR_BINARY}|archive_areas ${LH_ARCHIVE_AREAS}|chroot_filesystem ${LH_CHROOT_FILESYSTEM}|linux_flavours ${LH_LINUX_FLAVOURS}|security ${LH_SECURITY}|symlinks ${LH_SYMLINKS}|sysvinit ${LH_SYSVINIT}|binary_indices ${LH_BINARY_INDICES}|bootappend_install ${LH_BOOTAPPEND_INSTALL}|bootappend_live ${LH_BOOTAPPEND_LIVE}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|iso_application ${LH_ISO_APPLICATION}|iso_preparer ${LH_ISO_PREPARER}|iso_publisher ${LH_ISO_PUBLISHER}|iso_volume ${LH_ISO_VOLUME}|memtest ${LH_MEMTEST}|net_path ${LH_NET_ROOT_PATH}|net_server ${LH_NET_ROOT_SERVER}|source_images ${LH_SOURCE_IMAGES}|source ${LH_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}\n" >> /var/log/live
fi
sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html