diff options
| author | Richard Nelson <unixabg@gmail.com> | 2014-06-22 12:15:39 -0500 |
|---|---|---|
| committer | Richard Nelson <unixabg@gmail.com> | 2014-06-22 12:15:39 -0500 |
| commit | ca941152b4b2e3d474f251a5058df7d11741b0f9 (patch) | |
| tree | 68a1a9704c9ff025eb1bfa02983f30c5f5be7949 /frontend/cgi/live-build-cgi | |
| parent | 846e8a079578507f576f6cb9e2628cb8ff8ca138 (diff) | |
| download | vyos-live-build-ca941152b4b2e3d474f251a5058df7d11741b0f9.tar.gz vyos-live-build-ca941152b4b2e3d474f251a5058df7d11741b0f9.zip | |
Add --apt option on frontend/cgi.
Diffstat (limited to 'frontend/cgi/live-build-cgi')
| -rwxr-xr-x | frontend/cgi/live-build-cgi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/frontend/cgi/live-build-cgi b/frontend/cgi/live-build-cgi index 15326df08..b68d34c39 100755 --- a/frontend/cgi/live-build-cgi +++ b/frontend/cgi/live-build-cgi @@ -78,6 +78,7 @@ else # Standard options LIVE_IMAGE_TYPE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1) LB_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1) + LB_APT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt=[a-u]+' | cut -f 2 -d '=' | head -n1) # Advanced bootstrap options LIVE_IMAGE_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) @@ -135,6 +136,7 @@ else -e "s/LIVE_IMAGE_TYPE/${LIVE_IMAGE_TYPE}/" \ -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \ -e "s#_LB_CONFIG#${_LB_CONFIG}#" \ + -e "s/LB_APT/${LB_APT}/" \ -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \ -e "s/LIVE_IMAGE_ARCHITECTURE/${LIVE_IMAGE_ARCHITECTURE}/" \ -e "s/LIVE_IMAGE_ARCHIVE_AREAS/${LIVE_IMAGE_ARCHIVE_AREAS}/" \ @@ -180,6 +182,7 @@ _LB_CONFIG="${_LB_CONFIG}" # Standard options LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE}" LB_DISTRIBUTION="${LB_DISTRIBUTION}" +LB_APT="${LB_APT}" # Advanced bootstrap options LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}" @@ -211,7 +214,7 @@ LB_SOURCE="${LB_SOURCE}" EOF echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live/live-build-request - echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LIVE_IMAGE_TYPE}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LIVE_IMAGE_ARCHITECTURE}|archive_areas ${LIVE_IMAGE_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|apt_indices ${LB_APT_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live/live-build-request + echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LIVE_IMAGE_TYPE}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|apt ${LB_APT}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LIVE_IMAGE_ARCHITECTURE}|archive_areas ${LIVE_IMAGE_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|apt_indices ${LB_APT_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live/live-build-request fi sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html |