summaryrefslogtreecommitdiff
path: root/cgi
diff options
context:
space:
mode:
Diffstat (limited to 'cgi')
-rwxr-xr-xcgi/cgi202
-rwxr-xr-xcgi/cron14
-rw-r--r--cgi/default6
3 files changed, 111 insertions, 111 deletions
diff --git a/cgi/cgi b/cgi/cgi
index c52fe23..2ab6e5b 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -9,7 +9,7 @@
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Reading defaults
if [ -r /etc/default/live-build.cgi ]
@@ -37,9 +37,9 @@ cat "${_TEMPLATES}"/header.html
if [ -z "${QUERY_STRING}" ]
then
# Sending html form
- sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
- -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
- -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
+ sed -e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \
+ -e "s#LB_MIRROR_BINARY_SECURITY#${LB_MIRROR_BINARY_SECURITY}#" \
+ -e "s#LB_MIRROR_BINARY#${LB_MIRROR_BINARY}#" \
-e "s/VERSION/${VERSION}/" \
-e "s/DATE/`date +%Y%m%d-%H:%M`/" \
"${_TEMPLATES}"/form.html
@@ -62,45 +62,45 @@ else
_EMAIL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])email=[-0-9a-zA-Z._@]+' | cut -f 2 -d '=' | head -n1)
# Standard options
- 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)
+ 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_PACKAGES_LISTS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])packages_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
- LH_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architecture=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architecture=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Advanced chroot options
- LH_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_LINUX_FLAVOURS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])linux_flavours=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])security=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_SYMLINKS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])symlinks=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_SYSVINIT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])sysvinit=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_LINUX_FLAVOURS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])linux_flavours=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])security=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SYMLINKS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])symlinks=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SYSVINIT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])sysvinit=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Advanced binary options
- LH_BINARY_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_BOOTAPPEND_INSTALL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_install=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
- LH_BOOTAPPEND_LIVE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_live=[-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-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_ISO_APPLICATION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_application=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_ISO_PREPARER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_preparer=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_ISO_PUBLISHER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_publisher=[-0-9a-zA-Z. ~;:/_@]+' | cut -f 2 -d '=' | head -n1)
- LH_ISO_VOLUME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_volume=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9a-z+]+' | cut -f 2 -d '=' | head -n1)
- LH_NET_ROOT_PATH=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_path=[-0-9a-zA-Z._/]+' | cut -f 2 -d '=' | head -n1)
- LH_NET_ROOT_SERVER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_server=[0-9.]+' | cut -f 2 -d '=' | head -n1)
+ LB_BINARY_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_BOOTAPPEND_INSTALL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_install=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
+ LB_BOOTAPPEND_LIVE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_live=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
+ LB_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_DEBIAN_INSTALLER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_ENCRYPTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])encryption=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_ISO_APPLICATION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_application=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_ISO_PREPARER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_preparer=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_ISO_PUBLISHER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_publisher=[-0-9a-zA-Z. ~;:/_@]+' | cut -f 2 -d '=' | head -n1)
+ LB_ISO_VOLUME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_volume=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9a-z+]+' | cut -f 2 -d '=' | head -n1)
+ LB_NET_ROOT_PATH=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_path=[-0-9a-zA-Z._/]+' | cut -f 2 -d '=' | head -n1)
+ LB_NET_ROOT_SERVER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_server=[0-9.]+' | cut -f 2 -d '=' | head -n1)
# Advanced source options
- LH_SOURCE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_SOURCE_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source_images=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SOURCE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SOURCE_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source_images=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Unofficial options
_CUSTOM_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])custom_bootstrap=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
@@ -113,9 +113,9 @@ else
then
echo "<h2><div style='color: red;'>Error: No email address specified.</div></h2>"
- sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
- -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
- -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
+ sed -e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \
+ -e "s#LB_MIRROR_BINARY_SECURITY#${LB_MIRROR_BINARY_SECURITY}#" \
+ -e "s#LB_MIRROR_BINARY#${LB_MIRROR_BINARY}#" \
-e "s/VERSION/${VERSION}/" \
-e "s/DATE/`date +%Y%m%d-%H:%M`/" \
"${_TEMPLATES}"/form.html
@@ -131,38 +131,38 @@ else
# Note: On each string remember to use a delimeter that is not in the string.
sed -e "s/BUILD/${_BUILD}/g" \
-e "s/EMAIL/${_EMAIL}/" \
- -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}/" \
- -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
- -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
- -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
- -e "s/LH_ARCHIVE_AREAS/${LH_ARCHIVE_AREAS}/" \
- -e "s/LH_CHROOT_FILESYSTEM/${LH_CHROOT_FILESYSTEM}/" \
- -e "s/LH_LINUX_FLAVOURS/${LH_LINUX_FLAVOURS}/" \
- -e "s/LH_SECURITY/${LH_SECURITY}/" \
- -e "s/LH_SYMLINKS/${LH_SYMLINKS}/" \
- -e "s/LH_SYSVINIT/${LH_SYSVINIT}/" \
- -e "s/LH_BINARY_INDICES/${LH_BINARY_INDICES}/" \
- -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#" \
- -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" \
- -e "s/LH_BOOTLOADER/${LH_BOOTLOADER}/" \
- -e "s/LH_DEBIAN_INSTALLER/${LH_DEBIAN_INSTALLER}/" \
- -e "s/LH_ENCRYPTION/${LH_ENCRYPTION}/" \
- -e "s#LH_ISO_APPLICATION#${LH_ISO_APPLICATION}#" \
- -e "s#LH_ISO_PREPARER#${LH_ISO_PREPARER}#" \
- -e "s#LH_ISO_PUBLISHER#${LH_ISO_PUBLISHER}#" \
- -e "s#LH_ISO_VOLUME#${LH_ISO_VOLUME}#" \
- -e "s/LH_MEMTEST/${LH_MEMTEST}/" \
- -e "s#LH_NET_ROOT_PATH#${LH_NET_ROOT_PATH}#" \
- -e "s/LH_NET_ROOT_SERVER/${LH_NET_ROOT_SERVER}/" \
+ -e "s/LB_BINARY_IMAGES/${LB_BINARY_IMAGES}/" \
+ -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \
+ -e "s/LB_PACKAGES_LISTS/${LB_PACKAGES_LISTS}/" \
+ -e "s/LB_TASKS/${LB_TASKS}/" \
+ -e "s/LB_PACKAGES/${LB_PACKAGES}/" \
+ -e "s/LB_ARCHITECTURE/${LB_ARCHITECTURE}/" \
+ -e "s/LB_BOOTSTRAP_FLAVOUR/${LB_BOOTSTRAP_FLAVOUR}/" \
+ -e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \
+ -e "s#LB_MIRROR_BINARY_SECURITY#${LB_MIRROR_BINARY_SECURITY}#" \
+ -e "s#LB_MIRROR_BINARY#${LB_MIRROR_BINARY}#" \
+ -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \
+ -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \
+ -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \
+ -e "s/LB_SECURITY/${LB_SECURITY}/" \
+ -e "s/LB_SYMLINKS/${LB_SYMLINKS}/" \
+ -e "s/LB_SYSVINIT/${LB_SYSVINIT}/" \
+ -e "s/LB_BINARY_INDICES/${LB_BINARY_INDICES}/" \
+ -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \
+ -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \
+ -e "s/LB_BOOTLOADER/${LB_BOOTLOADER}/" \
+ -e "s/LB_DEBIAN_INSTALLER/${LB_DEBIAN_INSTALLER}/" \
+ -e "s/LB_ENCRYPTION/${LB_ENCRYPTION}/" \
+ -e "s#LB_ISO_APPLICATION#${LB_ISO_APPLICATION}#" \
+ -e "s#LB_ISO_PREPARER#${LB_ISO_PREPARER}#" \
+ -e "s#LB_ISO_PUBLISHER#${LB_ISO_PUBLISHER}#" \
+ -e "s#LB_ISO_VOLUME#${LB_ISO_VOLUME}#" \
+ -e "s/LB_MEMTEST/${LB_MEMTEST}/" \
+ -e "s#LB_NET_ROOT_PATH#${LB_NET_ROOT_PATH}#" \
+ -e "s/LB_NET_ROOT_SERVER/${LB_NET_ROOT_SERVER}/" \
-e "s#SERVER#${_SERVER}#g" \
- -e "s/LH_SOURCE_IMAGES/${LH_SOURCE_IMAGES}/" \
- -e "s/LH_SOURCE/${LH_SOURCE}/" \
+ -e "s/LB_SOURCE_IMAGES/${LB_SOURCE_IMAGES}/" \
+ -e "s/LB_SOURCE/${LB_SOURCE}/" \
-e "s#CUSTOM_BOOTSTRAP#${_CUSTOM_BOOTSTRAP}#" \
-e "s#CUSTOM_BINARY#${_CUSTOM_BINARY}#" \
"${_TEMPLATES}"/build.html
@@ -181,55 +181,55 @@ _EMAIL="${_EMAIL}"
REMOTE_ADDR="${REMOTE_ADDR}"
# Standard options
-LH_BINARY_IMAGES="${LH_BINARY_IMAGES}"
-LH_DISTRIBUTION="${LH_DISTRIBUTION}"
-LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS}"
-LH_TASKS="${LH_TASKS}"
-LH_PACKAGES="${LH_PACKAGES}"
+LB_BINARY_IMAGES="${LB_BINARY_IMAGES}"
+LB_DISTRIBUTION="${LB_DISTRIBUTION}"
+LB_PACKAGES_LISTS="${LB_PACKAGES_LISTS}"
+LB_TASKS="${LB_TASKS}"
+LB_PACKAGES="${LB_PACKAGES}"
# Advanced bootstrap options
-LH_ARCHITECTURE="${LH_ARCHITECTURE}"
-LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}"
-LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
-LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
-LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"
+LB_ARCHITECTURE="${LB_ARCHITECTURE}"
+LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}"
+LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}"
+LB_MIRROR_BINARY="${LB_MIRROR_BINARY}"
+LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}"
# Advanced chroot options
-LH_CHROOT_FILESYSTEM="${LH_CHROOT_FILESYSTEM}"
-LH_LINUX_FLAVOURS="${LH_LINUX_FLAVOURS}"
-LH_SECURITY="${LH_SECURITY}"
-LH_SYMLINKS="${LH_SYMLINKS}"
-LH_SYSVINIT="${LH_SYSVINIT}"
+LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}"
+LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS}"
+LB_SECURITY="${LB_SECURITY}"
+LB_SYMLINKS="${LB_SYMLINKS}"
+LB_SYSVINIT="${LB_SYSVINIT}"
# Advanced binary options
-LH_BINARY_INDICES="${LH_BINARY_INDICES}"
-LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL}"
-LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE}"
-LH_BOOTLOADER="${LH_BOOTLOADER}"
-LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
-LH_ENCRYPTION="${LH_ENCRYPTION}"
-LH_ISO_APPLICATION="${LH_ISO_APPLICATION}"
-LH_ISO_PREPARER="${LH_ISO_PREPARER}"
-LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER}"
-LH_ISO_VOLUME="${LH_ISO_VOLUME}"
-LH_MEMTEST="${LH_MEMTEST}"
-LH_NET_ROOT_PATH="${LH_NET_ROOT_PATH}"
-LH_NET_ROOT_SERVER="${LH_NET_ROOT_SERVER}"
+LB_BINARY_INDICES="${LB_BINARY_INDICES}"
+LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL}"
+LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}"
+LB_BOOTLOADER="${LB_BOOTLOADER}"
+LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER}"
+LB_ENCRYPTION="${LB_ENCRYPTION}"
+LB_ISO_APPLICATION="${LB_ISO_APPLICATION}"
+LB_ISO_PREPARER="${LB_ISO_PREPARER}"
+LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER}"
+LB_ISO_VOLUME="${LB_ISO_VOLUME}"
+LB_MEMTEST="${LB_MEMTEST}"
+LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH}"
+LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER}"
# Advanced source options
-LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES}"
-LH_SOURCE="${LH_SOURCE}"
+LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}"
+LB_SOURCE="${LB_SOURCE}"
# Unofficial options
_CUSTOM_BOOTSTRAP="${_CUSTOM_BOOTSTRAP}"
_CUSTOM_BINARY="${_CUSTOM_BINARY}"
# Other
-LH_REPOSITORIES="${LH_REPOSITORIES}"
+LB_REPOSITORIES="${LB_REPOSITORIES}"
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 ${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
+ echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-build.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|packages_lists ${LB_PACKAGES_LISTS}|tasks ${LB_TASKS}|packages ${LB_PACKAGES}|architecture ${LB_ARCHITECTURE}|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}|symlinks ${LB_SYMLINKS}|sysvinit ${LB_SYSVINIT}|binary_indices ${LB_BINARY_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|encryption ${LB_ENCRYPTION}|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}|source ${LB_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}\n" >> /var/log/live
fi
sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
diff --git a/cgi/cron b/cgi/cron
index bfac306..1cbf018 100755
--- a/cgi/cron
+++ b/cgi/cron
@@ -9,7 +9,7 @@
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Reading defaults
if [ -r /etc/default/live-build.cgi ]
@@ -66,10 +66,10 @@ then
_EMAIL=`awk -F\" '/^_EMAIL=/{print $2}' ${_FILE}`
# Pull in the remote address, atchitecture, and distribution
_REMOTE_ADDR=`awk -F\" '/^REMOTE_ADDR=/{print $2}' ${_FILE}`
- _LH_ARCHITECTURE=`awk -F\" '/^LH_ARCHITECTURE=/{print $2}' ${_FILE}`
- _LH_DISTRIBUTION=`awk -F\" '/^LH_DISTRIBUTION=/{print $2}' ${_FILE}`
- _LH_PACKAGES_LISTS=`awk -F\" '/^LH_PACKAGES_LISTS=/{print $2}' ${_FILE}`
- _LH_PACKAGES=`awk -F\" '/^LH_PACKAGES=/{print $2}' ${_FILE}`
+ _LB_ARCHITECTURE=`awk -F\" '/^LB_ARCHITECTURE=/{print $2}' ${_FILE}`
+ _LB_DISTRIBUTION=`awk -F\" '/^LB_DISTRIBUTION=/{print $2}' ${_FILE}`
+ _LB_PACKAGES_LISTS=`awk -F\" '/^LB_PACKAGES_LISTS=/{print $2}' ${_FILE}`
+ _LB_PACKAGES=`awk -F\" '/^LB_PACKAGES=/{print $2}' ${_FILE}`
# Pull in the custom bootstrap
_CUSTOM_BOOTSTRAP=`awk -F\" '/^_CUSTOM_BOOTSTRAP=/{print $2}' ${_FILE}`
# Pull in the custom binary
@@ -112,10 +112,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} ${_LH_ARCHITECTURE}/${_LH_DISTRIBUTION}/${_LH_PACKAGES_LISTS}/${_LH_PACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
+ echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURE}/${_LB_DISTRIBUTION}/${_LB_PACKAGES_LISTS}/${_LB_PACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
else
_STATUS="maybe-failed"
- echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LH_ARCHITECTURE}/${_LH_DISTRIBUTION}/${_LH_PACKAGES_LISTS}/${_LH_PACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
+ echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURE}/${_LB_DISTRIBUTION}/${_LB_PACKAGES_LISTS}/${_LB_PACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
fi
sed -e "s/BUILD/${_BUILD}/g" \
diff --git a/cgi/default b/cgi/default
index b3a3729..37a879b 100644
--- a/cgi/default
+++ b/cgi/default
@@ -10,8 +10,8 @@ _DESTDIR="/srv/debian-live/build/www"
_TEMPLATES="/usr/share/live/build/templates/cgi/${_MODE}"
_TEMPDIR="/srv/debian-live/build/tmp"
-LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
-LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
+LB_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+LB_MIRROR_BINARY="http://ftp.debian.org/debian/"
+LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
_SERVER="http://live.debian.net/build"
generated by cgit v1.0 at 2024-11-21 17:26:29 +0000