diff options
author | Richard Nelson <unixabg@gmail.com> | 2015-04-15 13:43:38 -0500 |
---|---|---|
committer | Richard Nelson <unixabg@gmail.com> | 2015-04-15 13:43:38 -0500 |
commit | 3e94a680577e19cd171f1d53e0589c06700286cf (patch) | |
tree | 91be8b9e6253a873438baa27e6157f5f7242dde1 | |
parent | 994b335f53f135805add887dbc1dd92f0027b7a8 (diff) | |
download | vyos-live-build-3e94a680577e19cd171f1d53e0589c06700286cf.tar.gz vyos-live-build-3e94a680577e19cd171f1d53e0589c06700286cf.zip |
Rename LIVE_IMAGE_TYPE to LB_BINARY_IMAGES on l-b-cgi frontend.
-rwxr-xr-x | frontend/cgi/live-build-cgi | 8 | ||||
-rw-r--r-- | templates/cgi/debian/build.html | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/frontend/cgi/live-build-cgi b/frontend/cgi/live-build-cgi index 4124ec54e..f812f0d6a 100755 --- a/frontend/cgi/live-build-cgi +++ b/frontend/cgi/live-build-cgi @@ -76,7 +76,7 @@ else _LB_CONFIG=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])config=[-a-z]+' | cut -f 2 -d '=' | head -n1) # Standard options - LIVE_IMAGE_TYPE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1) + LB_BINARY_IMAGES=$(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) @@ -133,7 +133,7 @@ else sed -e "s/BUILD/${_BUILD}/g" \ -e "s/EMAIL/${_EMAIL}/" \ -e "s/QUEUENUM/${_QUEUENUM}/" \ - -e "s/LIVE_IMAGE_TYPE/${LIVE_IMAGE_TYPE}/" \ + -e "s/LB_BINARY_IMAGES/${LB_BINARY_IMAGES}/" \ -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \ -e "s#_LB_CONFIG#${_LB_CONFIG}#" \ -e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \ @@ -180,7 +180,7 @@ _LB_CGIPACKAGES="${_LB_CGIPACKAGES}" _LB_CONFIG="${_LB_CONFIG}" # Standard options -LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE}" +LB_BINARY_IMAGES="${LB_BINARY_IMAGES}" LB_DISTRIBUTION="${LB_DISTRIBUTION}" LB_APT="${LB_APT}" @@ -214,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}|apt ${LB_APT}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|archive_areas ${LB_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 ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|apt ${LB_APT}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|archive_areas ${LB_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 diff --git a/templates/cgi/debian/build.html b/templates/cgi/debian/build.html index e3dffbdc2..642de6314 100644 --- a/templates/cgi/debian/build.html +++ b/templates/cgi/debian/build.html @@ -12,7 +12,7 @@ <table> <tr><td>Email: </td><td>EMAIL</td></tr> - <tr><td>--binary-image: </td><td>LIVE_IMAGE_TYPE</td></tr> + <tr><td>--binary-image: </td><td>LB_BINARY_IMAGES</td></tr> <tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr> <tr><td>--config: </td><td>_LB_CONFIG</td></tr> <tr><td>--apt: </td><td>LB_APT</td></tr> |