r2757 - dists/trunk/live-webhelper/scripts
daniel at alioth.debian.org
daniel at alioth.debian.org
Mon Aug 13 21:13:36 UTC 2007
Author: daniel
Date: 2007-08-13 21:13:35 +0000 (Mon, 13 Aug 2007)
New Revision: 2757
Modified:
dists/trunk/live-webhelper/scripts/cgi
dists/trunk/live-webhelper/scripts/cron
Log:
Modified: dists/trunk/live-webhelper/scripts/cgi
===================================================================
--- dists/trunk/live-webhelper/scripts/cgi 2007-08-13 15:28:17 UTC (rev 2756)
+++ dists/trunk/live-webhelper/scripts/cgi 2007-08-13 21:13:35 UTC (rev 2757)
@@ -112,7 +112,7 @@
# Unofficial options
CUSTOM_BOOTSTRAP=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])custom_bootstrap=[0-9,a-z,A-Z,., ,~,;,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
CUSTOM_BINARY=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])custom_binary=[0-9,a-z,A-Z,., ,~,;,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
-
+
# FIXME: filter invalid options
unset QUERY_STRING
@@ -188,49 +188,49 @@
EMAIL="${EMAIL}"
# Standard options
-BINARY_IMAGES="${BINARY_IMAGES}"
-DISTRIBUTION="${DISTRIBUTION}"
-PACKAGES_LISTS="${PACKAGES_LISTS}"
-PACKAGES="${PACKAGES}"
+LH_BINARY_IMAGES="${BINARY_IMAGES}"
+LH_DISTRIBUTION="${DISTRIBUTION}"
+LH_PACKAGES_LISTS="${PACKAGES_LISTS}"
+LH_PACKAGES="${PACKAGES}"
# Advanced bootstrap options
-ARCHITECTURE="${ARCHITECTURE}"
-MIRROR_BOOTSTRAP_SECURITY="${MIRROR_BOOTSTRAP}"
-MIRROR_BOOTSTRAP="${MIRROR_BOOTSTRAP}"
-MIRROR_BINARY_SECURITY="${MIRROR_BINARY_SECURITY}"
-MIRROR_BINARY="${MIRROR_BINARY}"
-SECTIONS="${SECTIONS}"
+LH_ARCHITECTURE="${ARCHITECTURE}"
+LH_MIRROR_BOOTSTRAP_SECURITY="${MIRROR_BOOTSTRAP}"
+LH_MIRROR_BOOTSTRAP="${MIRROR_BOOTSTRAP}"
+LH_MIRROR_BINARY_SECURITY="${MIRROR_BINARY_SECURITY}"
+LH_MIRROR_BINARY="${MIRROR_BINARY}"
+LH_SECTIONS="${SECTIONS}"
# Advanced chroot options
-CHROOT_FILESYSTEM="${CHROOT_FILESYSTEM}"
-LINUX_FLAVOURS="${LINUX_FLAVOURS}"
-SECURITY="${SECURITY}"
-SYMLINKS="${SYMLINKS}"
-SYSVINIT="${SYSVINIT}"
+LH_CHROOT_FILESYSTEM="${CHROOT_FILESYSTEM}"
+LH_LINUX_FLAVOURS="${LINUX_FLAVOURS}"
+LH_SECURITY="${SECURITY}"
+LH_SYMLINKS="${SYMLINKS}"
+LH_SYSVINIT="${SYSVINIT}"
# Advanced binary options
-BINARY_INDICES="${BINARY_INDICES}"
-BOOTAPPEND="${BOOTAPPEND}"
-BOOTLOADER="${BOOTLOADER}"
-DEBIAN_INSTALLER="${DEBIAN_INSTALLER}"
-ENCRYPTION="${ENCRYPTION}"
-HOSTNAME="${HOSTNAME}"
-ISO_APPLICATION="${ISO_APPLICATION}"
-ISO_PREPARER="${ISO_PREPARER}"
-ISO_PUBLISHER="${ISO_PUBLISHER}"
-ISO_VOLUME="${ISO_VOLUME}"
-MEMTEST="${MEMTEST}"
-NET_PATH="${NET_PATH}"
-NET_SERVER="${NET_SERVER}"
-USERNAME="${USERNAME}"
+LH_BINARY_INDICES="${BINARY_INDICES}"
+LH_BOOTAPPEND="${BOOTAPPEND}"
+LH_BOOTLOADER="${BOOTLOADER}"
+LH_DEBIAN_INSTALLER="${DEBIAN_INSTALLER}"
+LH_ENCRYPTION="${ENCRYPTION}"
+LH_HOSTNAME="${HOSTNAME}"
+LH_ISO_APPLICATION="${ISO_APPLICATION}"
+LH_ISO_PREPARER="${ISO_PREPARER}"
+LH_ISO_PUBLISHER="${ISO_PUBLISHER}"
+LH_ISO_VOLUME="${ISO_VOLUME}"
+LH_MEMTEST="${MEMTEST}"
+LH_NET_PATH="${NET_PATH}"
+LH_NET_SERVER="${NET_SERVER}"
+LH_USERNAME="${USERNAME}"
# Advanced source options
-SOURCE_IMAGES="${SOURCE_IMAGES}"
-SOURCE="${SOURCE}"
+LH_SOURCE_IMAGES="${SOURCE_IMAGES}"
+LH_SOURCE="${SOURCE}"
# Unofficial options
-CUSTOM_BOOTSTRAP="${CUSTOM_BOOTSTRAP}"
-CUSTOM_BINARY="${CUSTOM_BINARY}"
+LH_CUSTOM_BOOTSTRAP="${CUSTOM_BOOTSTRAP}"
+LH_CUSTOM_BINARY="${CUSTOM_BINARY}"
EOF
echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-webhelper: add web build (${BUILD})." >> /var/log/live
Modified: dists/trunk/live-webhelper/scripts/cron
===================================================================
--- dists/trunk/live-webhelper/scripts/cron 2007-08-13 15:28:17 UTC (rev 2756)
+++ dists/trunk/live-webhelper/scripts/cron 2007-08-13 21:13:35 UTC (rev 2757)
@@ -52,86 +52,8 @@
then
for FILE in "${TEMPDIR}"/*.build
do
- # Reading build file
- . "${FILE}"
-
echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: begin web build (${BUILD})." >> /var/log/live
- # Enable debug option
- if [ "${DEBUG}" = "enabled" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --debug --verbose"
- fi
-
- # Assembling standard options
- if [ -n "${BINARY_IMAGES}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --binary-images ${BINARY_IMAGES}"
- fi
-
- if [ -n "${DISTRIBUTION}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --distribution ${DISTRIBUTION}"
- fi
-
- if [ -n "${PACKAGES}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --packages ${PACKAGES}"
- fi
-
- if [ -n "${PACKAGES_LISTS}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --packages-lists ${PACKAGES_LISTS}"
- fi
-
- # Assembling chroot options
- if [ -n "${CHROOT_FILESYSTEM}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --chroot-filesystem ${CHROOT_FILESYSTEM}"
- fi
-
- # Assembling binary options
- if [ -n "${ISO_APPLICATION}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --iso-application ${ISO_APPLICATION}"
- fi
-
- if [ -n "${ISO_PREPARER}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --iso-preparer ${ISO_PREPARER}"
- fi
-
- if [ -n "${ISO_PUBLISHER}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --iso-publisher ${ISO_PUBLISHER}"
- fi
-
- if [ -n "${ISO_VOLUME}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --iso-volume ${ISO_VOLUME}"
- fi
-
- # Assembling other options
- if [ -n "${MIRROR_BOOTSTRAP}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --mirror-bootstrap ${MIRROR_BOOTSTRAP}"
- fi
-
- if [ -n "${MIRROR_BOOTSTRAP_SECURITY}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY}"
- fi
-
- if [ -n "${MIRROR_BINARY}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --mirror-binary ${MIRROR_BINARY}"
- fi
-
- if [ -n "${MIRROR_BINARY_SECURITY}" ]
- then
- LIVE_OPTIONS="${LIVE_OPTIONS} --mirror-binary-security ${MIRROR_BINARY_SECURITY}"
- fi
-
# Creating build directory which also creates the config/chroot_sources folder
mkdir -p "${TEMPDIR}"/"${BUILD}"/debian-live/config/chroot_sources
@@ -140,7 +62,7 @@
then
echo "${CUSTOM_BOOTSTRAP}" > "${TEMPDIR}"/"${BUILD}"/debian-live/config/chroot_sources/custom.bootstrap
fi
-
+
if [ -n "${CUSTOM_BINARY}" ]
then
echo "${CUSTOM_BINARY}" > "${TEMPDIR}"/"${BUILD}"/debian-live/config/chroot_sources/custom.binary
@@ -151,7 +73,8 @@
# Generating image
cd "${TEMPDIR}"/"${BUILD}"
- make-live ${LIVE_OPTIONS} >> "${TEMPDIR}"/"${BUILD}"/log 2>&1
+ lh_config --config ${FILE} >> "${TEMPDIR}"/"${BUILD}"/log 2>&1
+ lh_build >> "${TEMPDIR}"/"${BUILD}"/log 2>&1
ERROR="${?}"
DATE_END="`date -R`"
More information about the debian-live-changes
mailing list