[Debian-live-changes] r2569 - in dists/trunk/live-webhelper: manpages scripts templates/debian-unofficial

rjent-guest at alioth.debian.org rjent-guest at alioth.debian.org
Mon Jul 23 18:45:39 UTC 2007 

Author: rjent-guest
Date: 2007-07-23 18:45:38 +0000 (Mon, 23 Jul 2007)
New Revision: 2569

Modified:
   dists/trunk/live-webhelper/manpages/live-webhelper.en.7
   dists/trunk/live-webhelper/scripts/cgi
   dists/trunk/live-webhelper/scripts/common
   dists/trunk/live-webhelper/scripts/cron
   dists/trunk/live-webhelper/scripts/default
   dists/trunk/live-webhelper/templates/debian-unofficial/build.html
   dists/trunk/live-webhelper/templates/debian-unofficial/form.html
Log:
initial work for debian-unofficial and DEBUG flag

Modified: dists/trunk/live-webhelper/manpages/live-webhelper.en.7
===================================================================
--- dists/trunk/live-webhelper/manpages/live-webhelper.en.7	2007-07-21 12:31:29 UTC (rev 2568)
+++ dists/trunk/live-webhelper/manpages/live-webhelper.en.7	2007-07-23 18:45:38 UTC (rev 2569)
@@ -1,4 +1,4 @@
-.TH LIVE\-WEBHELPER 7 "2007\-07\-09" "1.0~a18" "live\-webhelper"
+.TH LIVE\-WEBHELPER 7 "2007\-07\-16" "1.0~a19" "live\-webhelper"
 
 .SH NAME
 live\-webhelper \- Debian Live helper programs (web frontend)

Modified: dists/trunk/live-webhelper/scripts/cgi
===================================================================
--- dists/trunk/live-webhelper/scripts/cgi	2007-07-21 12:31:29 UTC (rev 2568)
+++ dists/trunk/live-webhelper/scripts/cgi	2007-07-23 18:45:38 UTC (rev 2569)
@@ -70,7 +70,7 @@
 	# Standard options
 	BINARY_IMAGES=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])binary_images=[a-z]+' | cut -f 2 -d '=' | head -n1)
 	DISTRIBUTION=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1)
-	PACKAGES_LISTS=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])packages_lists=[a-z,-]+' | cut -f 2 -d '=' | head -n1)
+	PACKAGES_LISTS=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])packages_lists=[0-9,a-z,-]+' | cut -f 2 -d '=' | head -n1)
 	PACKAGES=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])packages=[0-9,a-z,A-Z,., ,_,-]+' | cut -f 2 -d '=' | head -n1)
 
 	# Advanced bootstrap options
@@ -109,6 +109,10 @@
 	SOURCE=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1)
 	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-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
 
@@ -168,6 +172,8 @@
 	    -e "s/USERNAME/${USERNAME}/" \
 	    -e "s/SOURCE_IMAGES/${SOURCE_IMAGES}/" \
 	    -e "s/SOURCE/${SOURCE}/" \
+	    -e "s#CUSTOM_BOOTSTRAP#${CUSTOM_BOOTSTRAP}#" \
+	    -e "s#CUSTOM_BINARY#${CUSTOM_BINARY}#" \
 	"${TEMPLATES}"/build.html
 
 	# Creating temporary directory
@@ -221,6 +227,10 @@
 # Advanced source options
 SOURCE_IMAGES="${SOURCE_IMAGES}"
 SOURCE="${SOURCE}"
+
+# Unofficial options
+CUSTOM_BOOTSTRAP="${CUSTOM_BOOTSTRAP}"
+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/common
===================================================================
--- dists/trunk/live-webhelper/scripts/common	2007-07-21 12:31:29 UTC (rev 2568)
+++ dists/trunk/live-webhelper/scripts/common	2007-07-23 18:45:38 UTC (rev 2569)
@@ -1 +1 @@
-VERSION="1.0~a18"
+VERSION="1.0~a19"

Modified: dists/trunk/live-webhelper/scripts/cron
===================================================================
--- dists/trunk/live-webhelper/scripts/cron	2007-07-21 12:31:29 UTC (rev 2568)
+++ dists/trunk/live-webhelper/scripts/cron	2007-07-23 18:45:38 UTC (rev 2569)
@@ -57,6 +57,12 @@
 
 		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"
+		fi
+
 		# Assembling standard options
 		if [ -n "${BINARY_IMAGES}" ]
 		then
@@ -126,9 +132,20 @@
 			LIVE_OPTIONS="${LIVE_OPTIONS} --mirror-binary-security ${MIRROR_BINARY_SECURITY}"
 		fi
 
-		# Creating build directory
-		mkdir -p "${TEMPDIR}"/"${BUILD}"
+		# Creating build directory which also creates the config/chroot_sources folder
+		mkdir -p "${TEMPDIR}"/"${BUILD}"/debian-live/config/chroot_sources
 
+		# The next two tests are for unofficial third partyr repositories
+		if [ -n "${CUSTOM_BOOTSTRAP}" ]
+		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
+		fi
+
 		DATE_START="`date -R`"
 		echo "Begin: ${DATE_START}" > "${TEMPDIR}"/"${BUILD}"/log
 

Modified: dists/trunk/live-webhelper/scripts/default
===================================================================
--- dists/trunk/live-webhelper/scripts/default	2007-07-21 12:31:29 UTC (rev 2568)
+++ dists/trunk/live-webhelper/scripts/default	2007-07-23 18:45:38 UTC (rev 2569)
@@ -4,6 +4,8 @@
 
 MODE="debian-official"
 
+DEBUG="disabled"
+
 DESTDIR="/srv/debian-live/www/webhelper"
 TEMPLATES="/usr/share/live-webhelper/templates/${MODE}"
 TEMPDIR="/srv/tmp/live-webhelper"

Modified: dists/trunk/live-webhelper/templates/debian-unofficial/build.html
===================================================================
--- dists/trunk/live-webhelper/templates/debian-unofficial/build.html	2007-07-21 12:31:29 UTC (rev 2568)
+++ dists/trunk/live-webhelper/templates/debian-unofficial/build.html	2007-07-23 18:45:38 UTC (rev 2569)
@@ -71,6 +71,13 @@
 	<tr><td>--source-images: </td><td>SOURCE_IMAGES</td></tr>
 </table>
 
+<b>Unofficial options</b>
+
+<table>
+	<tr><td>custom.bootstrap: </td><td>CUSTOM_BOOTSTRAP</td></tr>
+	<tr><td>custom.binary: </td><td>CUSTOM_BINARY</td></tr>
+</table>
+
 </fieldset>
 
 <br />

Modified: dists/trunk/live-webhelper/templates/debian-unofficial/form.html
===================================================================
--- dists/trunk/live-webhelper/templates/debian-unofficial/form.html	2007-07-21 12:31:29 UTC (rev 2568)
+++ dists/trunk/live-webhelper/templates/debian-unofficial/form.html	2007-07-23 18:45:38 UTC (rev 2569)
@@ -326,6 +326,27 @@
 	</table>
 </div>
 
+<span id="click_6" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(6,"<b>Unofficial options</b>")'>
+	<b>Unofficial options</b><small>&nbsp;(click to expand)</small>
+	<br />
+</span>
+
+<div id="text_6" style='margin-left:0;display:none'>
+	<li> With custom.bootstrap the repository will be available at build time, so you just have to list the packages you want in packages. See "Standard options" above.	</li>
+	<li> With custom.binary the repository will be added to your live-system's /etc/apt/sources.list .</li>
+	<li> Example custom.{bootstrap,binary}: deb http://live.debian.net/debian/ etch main </li>
+	<table>
+		<tr>
+			<td><label for="Custom_Bootstrap">custom.bootstrap:</label> </td>
+			<td><input id="Custom_Bootstrap" name="custom_bootstrap" maxlength="128" size="50" type="text" /></td>
+		</tr>
+		<tr>
+			<td><label for="Custom_Binary">custom.binary:</label> </td>
+			<td><input id="Custom_Binary" name="custom_binary" maxlength="128" size="50" type="text" /></td>
+		</tr>
+	</table>
+</div>
+
 </fieldset>
 
 <br />

More information about the Debian-live-changes mailing list