l-b.cgi modify old --packages param to become cgipackages.list.chroot
This commit is contained in:
Richard Nelson
parent
b16617d8c1
commit
f4ee97726c
|
|
@ -63,12 +63,14 @@ else
|
|||
# Email
|
||||
_EMAIL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])email=[-0-9a-zA-Z._@]+' | cut -f 2 -d '=' | head -n1)
|
||||
|
||||
# CGI Packages List
|
||||
_LB_CGIPACKAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])cgipackages=[-0-9a-zA-Z. _+]+' | cut -f 2 -d '=' | head -n1)
|
||||
|
||||
# Standard options
|
||||
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_PACKAGE_LISTS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])package_lists=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1)
|
||||
LB_TASKS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])tasks=[-0-9a-zA-Z. _]+' | cut -f 2 -d '=' | head -n1)
|
||||
LB_PACKAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])packages=[-0-9a-zA-Z. _+]+' | cut -f 2 -d '=' | head -n1)
|
||||
|
||||
# Advanced bootstrap options
|
||||
LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
|
||||
|
|
@ -134,7 +136,7 @@ else
|
|||
-e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \
|
||||
-e "s/LB_PACKAGE_LISTS/${LB_PACKAGE_LISTS}/" \
|
||||
-e "s/LB_TASKS/${LB_TASKS}/" \
|
||||
-e "s/LB_PACKAGES/${LB_PACKAGES}/" \
|
||||
-e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \
|
||||
-e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \
|
||||
-e "s/LB_BOOTSTRAP_FLAVOUR/${LB_BOOTSTRAP_FLAVOUR}/" \
|
||||
-e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \
|
||||
|
|
@ -176,12 +178,14 @@ _EMAIL="${_EMAIL}"
|
|||
|
||||
REMOTE_ADDR="${REMOTE_ADDR}"
|
||||
|
||||
# CGI Packages List
|
||||
_LB_CGIPACKAGES="${_LB_CGIPACKAGES}"
|
||||
|
||||
# Standard options
|
||||
LB_BINARY_IMAGES="${LB_BINARY_IMAGES}"
|
||||
LB_DISTRIBUTION="${LB_DISTRIBUTION}"
|
||||
LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS}"
|
||||
LB_TASKS="${LB_TASKS}"
|
||||
LB_PACKAGES="${LB_PACKAGES}"
|
||||
|
||||
# Advanced bootstrap options
|
||||
LB_ARCHITECTURES="${LB_ARCHITECTURES}"
|
||||
|
|
@ -222,7 +226,7 @@ LB_ARCHIVES="${LB_ARCHIVES}"
|
|||
EOF
|
||||
|
||||
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live
|
||||
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|package_lists ${LB_PACKAGE_LISTS}|tasks ${LB_TASKS}|packages ${LB_PACKAGES}|architectures ${LB_ARCHITECTURES}|mirror_bootstrap_security ${LB_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LB_MIRROR_BOOTSTRAP}|mirror_binary_security ${LB_MIRROR_BINARY_SECURITY}|mirror_binary ${LB_MIRROR_BINARY}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|binary_indices ${LB_BINARY_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}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}" >> /var/log/live
|
||||
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|package_lists ${LB_PACKAGE_LISTS}|tasks ${LB_TASKS}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|mirror_bootstrap_security ${LB_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LB_MIRROR_BOOTSTRAP}|mirror_binary_security ${LB_MIRROR_BINARY_SECURITY}|mirror_binary ${LB_MIRROR_BINARY}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|binary_indices ${LB_BINARY_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}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}" >> /var/log/live
|
||||
fi
|
||||
|
||||
sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
|
||||
|
|
|
|||
|
|
@ -66,12 +66,13 @@ then
|
|||
_BUILD=`awk -F\" '/^_BUILD=/{print $2}' ${_FILE}`
|
||||
# Pull in the email address
|
||||
_EMAIL=`awk -F\" '/^_EMAIL=/{print $2}' ${_FILE}`
|
||||
# Pull in the remote address, atchitecture, and distribution
|
||||
# Pull in cgipackages for config/package-lists/cgipackages.list.chroot
|
||||
_LB_CGIPACKAGES=`awk -F\" '/^_LB_CGIPACKAGES=/{print $2}' ${_FILE}`
|
||||
# Pull in the remote address, atchitecture, distribution, and package-lists.
|
||||
_REMOTE_ADDR=`awk -F\" '/^REMOTE_ADDR=/{print $2}' ${_FILE}`
|
||||
_LB_ARCHITECTURES=`awk -F\" '/^LB_ARCHITECTURES=/{print $2}' ${_FILE}`
|
||||
_LB_DISTRIBUTION=`awk -F\" '/^LB_DISTRIBUTION=/{print $2}' ${_FILE}`
|
||||
_LB_PACKAGE_LISTS=`awk -F\" '/^LB_PACKAGE_LISTS=/{print $2}' ${_FILE}`
|
||||
_LB_PACKAGES=`awk -F\" '/^LB_PACKAGES=/{print $2}' ${_FILE}`
|
||||
_LB_PACKAGE_LISTS=`awk -F\" '/^LB_PACKAGE_LISTS=/{print $2}' ${_FILE}`i
|
||||
# Pull in the custom bootstrap
|
||||
_CUSTOM_BOOTSTRAP=`awk -F\" '/^_CUSTOM_BOOTSTRAP=/{print $2}' ${_FILE}`
|
||||
# Pull in the custom binary
|
||||
|
|
@ -80,7 +81,16 @@ then
|
|||
# Drop out some build data for information if something goes wrong.
|
||||
echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
|
||||
|
||||
# Creating build directory which also creates the config/chroot_sources folder
|
||||
# Creating build directory and the config/package-lists
|
||||
mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/package-lists
|
||||
|
||||
# The next two tests are for unofficial third party archives
|
||||
if [ -n "${_LB_CGIPACKAGES}" ]
|
||||
then
|
||||
echo "${_LB_CGIPACKAGES}" > "${_TEMPDIR}"/"${_BUILD}"/config/package-lists/cgipackages.list.chroot
|
||||
fi
|
||||
|
||||
# Creating the config/chroot_sources folder
|
||||
mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/chroot_sources
|
||||
|
||||
# The next two tests are for unofficial third party archives
|
||||
|
|
@ -114,10 +124,10 @@ then
|
|||
if [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ]
|
||||
then
|
||||
_STATUS="maybe-successful"
|
||||
echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURES}/${_LB_DISTRIBUTION}/${_LB_PACKAGE_LISTS}/${_LB_PACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
|
||||
echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURES}/${_LB_DISTRIBUTION}/${_LB_PACKAGE_LISTS}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
|
||||
else
|
||||
_STATUS="maybe-failed"
|
||||
echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURES}/${_LB_DISTRIBUTION}/${_LB_PACKAGE_LISTS}/${_LB_PACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
|
||||
echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURES}/${_LB_DISTRIBUTION}/${_LB_PACKAGE_LISTS}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
|
||||
fi
|
||||
|
||||
sed -e "s/BUILD/${_BUILD}/g" \
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
|
||||
<tr><td>--package-lists: </td><td>LB_PACKAGE_LISTS</td></tr>
|
||||
<tr><td>--tasks: </td><td>LB_TASKS</td><tr>
|
||||
<tr><td>--packages: </td><td>LB_PACKAGES</td><tr>
|
||||
<tr><td>cgipackages.list.chroot: </td><td>_LB_CGIPACKAGES</td><tr>
|
||||
</table>
|
||||
|
||||
<b>Advanced bootstrap options</b>
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@
|
|||
<td><input id="Tasks" name="tasks" maxlength="256" size="50" type="text" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="Packages">--packages:</label> </td>
|
||||
<td><input id="Packages" name="packages" maxlength="256" size="50" type="text" /></td>
|
||||
<td><label for="Packages">cgipackages.list.chroot:</label> </td>
|
||||
<td><input id="Packages" name="cgipackages" maxlength="256" size="50" type="text" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
|
||||
<tr><td>--package-lists: </td><td>LB_PACKAGE_LISTS</td></tr>
|
||||
<tr><td>--tasks: </td><td>LB_TASKS</td><tr>
|
||||
<tr><td>--packages: </td><td>LB_PACKAGES</td><tr>
|
||||
<tr><td>cgipackages.list.chroot: </td><td>_LB_CGIPACKAGES</td><tr>
|
||||
</table>
|
||||
|
||||
<b>Advanced bootstrap options</b>
|
||||
|
|
|
|||
|
|
@ -79,8 +79,8 @@
|
|||
<td><input id="Tasks" name="tasks" maxlength="256" size="50" type="text" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="Packages">--packages:</label> </td>
|
||||
<td><input id="Packages" name="packages" maxlength="256" size="50" type="text" /></td>
|
||||
<td><label for="Packages">cgipackages.list.chroot:</label> </td>
|
||||
<td><input id="Packages" name="cgipackages" maxlength="256" size="50" type="text" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue