[Debian-live-changes] r1897 - in dists/trunk/live-webhelper: scripts templates

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-31 07:16:11 +0000 (Thu, 31 May 2007)
New Revision: 1897

Modified:
   dists/trunk/live-webhelper/scripts/cgi
   dists/trunk/live-webhelper/templates/build.html
Log:


Modified: dists/trunk/live-webhelper/scripts/cgi
===================================================================
--- dists/trunk/live-webhelper/scripts/cgi	2007-05-31 07:05:55 UTC (rev 1896)
+++ dists/trunk/live-webhelper/scripts/cgi	2007-05-31 07:16:11 UTC (rev 1897)
@@ -115,18 +115,37 @@
 	    -e "s/DISTRIBUTION/${DISTRIBUTION}/" \
 	    -e "s/PACKAGES_LISTS/${PACKAGES_LISTS}/" \
 	    -e "s/PACKAGES/${PACKAGES}/" \
+	    -e "s/ARCHITECTURE/${ARCHITECTURE}/" \
+	    -e "s/MIRROR_BOOTSTRAP_SECURITY/${MIRROR_BOOTSTRAP}/" \
+	    -e "s/MIRROR_BOOTSTRAP/${MIRROR_BOOTSTRAP}/" \
+	    -e "s/MIRROR_BINARY_SECURITY/${MIRROR_BINARY_SECURITY}/" \
+	    -e "s/MIRROR_BINARY/${MIRROR_BINARY}/" \
+	    -e "s/SECTIONS/${SECTIONS}/" \
 	    -e "s/CHROOT_FILESYSTEM/${CHROOT_FILESYSTEM}/" \
+	    -e "s/LINUX_FLAVOURS/${LINUX_FLAVOURS}/" \
+	    -e "s/SECURITY/${SECURITY}/" \
+	    -e "s/SYMLINKS/${SYMLINKS}/" \
+	    -e "s/SYSVINIT/${SYSVINIT}/" \
+	    -e "s/BINARY_INDICES/${BINARY_INDICES}/" \
+	    -e "s/BOOTAPPEND/${BOOTAPPEND}/" \
+	    -e "s/BOOTLOADER/${BOOTLOADER}/" \
+	    -e "s/DEBIAN_INSTALLER/${DEBIAN_INSTALLER}/" \
+	    -e "s/ENCRYPTION/${ENCRYPTION}/" \
+	    -e "s/HOSTNAME/${HOSTNAME}/" \
 	    -e "s/ISO_APPLICATION/${ISO_APPLICATION}/" \
 	    -e "s/ISO_PREPARER/${ISO_PREPARER}/" \
 	    -e "s/ISO_PUBLISHER/${ISO_PUBLISHER}/" \
 	    -e "s/ISO_VOLUME/${ISO_VOLUME}/" \
+	    -e "s/MEMTEST/${MEMTEST}/" \
+	    -e "s/NET_PATH/${NET_PATH}/" \
+	    -e "s/NET_SERVER/${NET_SERVER}/" \
+	    -e "s/USERNAME/${USERNAME}/" \
+	    -e "s/SOURCE_IMAGES/${SOURCE_IMAGES}/" \
+	    -e "s/SOURCE/${SOURCE}/" \
 	"${TEMPLATES}"/build.html
 
 	# Creating temporary directory
-	if [ ! -d "${TEMPDIR}" ]
-	then
-		mkdir -p "${TEMPDIR}"
-	fi
+	mkdir -p "${TEMPDIR}"
 
 # Writing build file
 cat > "${TEMPDIR}"/"${BUILD}".build << EOF
@@ -134,20 +153,48 @@
 # `date -R`
 
 BUILD="${BUILD}"
-
 EMAIL="${EMAIL}"
 
+# Standard options
 BINARY_IMAGES="${BINARY_IMAGES}"
 DISTRIBUTION="${DISTRIBUTION}"
 PACKAGES_LISTS="${PACKAGES_LISTS}"
 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}"
+
+# Advanced chroot options
 CHROOT_FILESYSTEM="${CHROOT_FILESYSTEM}"
+LINUX_FLAVOURS="${LINUX_FLAVOURS}"
+SECURITY="${SECURITY}"
+SYMLINKS="${SYMLINKS}"
+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}"
+
+# Advanced source options
+SOURCE_IMAGES="${SOURCE_IMAGES}"
+SOURCE="${SOURCE}"
 EOF
 
 	echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: add web build (${BUILD})." >> /var/log/live

Modified: dists/trunk/live-webhelper/templates/build.html
===================================================================
--- dists/trunk/live-webhelper/templates/build.html	2007-05-31 07:05:55 UTC (rev 1896)
+++ dists/trunk/live-webhelper/templates/build.html	2007-05-31 07:16:11 UTC (rev 1897)
@@ -24,10 +24,10 @@
 <table>
 	<tr><td>--architecture: </td><td>ARCHITECTURE</td></tr>
 	<tr><td>--bootstrap-flavour: </td><td>BOOTSTRAP_FLAVOUR</td></tr>
-	<!-- MIRROR_BOOTSTRAP -->
-	<!-- MIRROR_BOOTSTRAP_SECURITY -->
-	<!-- MIRROR_BINARY -->
-	<!-- MIRROR_BINARY_SECURITY -->
+	<tr><td>--mirror-bootstrap: </td><td>MIRROR_BOOTSTRAP</td></tr>
+	<tr><td>--mirror-bootstrap-security: </td><td>MIRROR_BOOTSTRAP_SECURITY</td></tr>
+	<tr><td>--mirror-binary: </td><td>MIRROR_BINARY</td></tr>
+	<tr><td>--mirror-binary-security: </td><td>MIRROR_BINARY_SECURITY</td></tr>
 	<tr><td>--sections: </td><td>SECTIONS</td></tr>
 </table>