[Debian-live-changes] r1646 - in dists/trunk/live-webbuilder: . templates

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-23 15:55:04 +0000 (Wed, 23 May 2007)
New Revision: 1646

Modified:
   dists/trunk/live-webbuilder/cron
   dists/trunk/live-webbuilder/live-webbuilder
   dists/trunk/live-webbuilder/templates/build.html
   dists/trunk/live-webbuilder/templates/form.html
Log:


Modified: dists/trunk/live-webbuilder/cron
===================================================================
--- dists/trunk/live-webbuilder/cron	2007-05-23 14:58:33 UTC (rev 1645)
+++ dists/trunk/live-webbuilder/cron	2007-05-23 15:55:04 UTC (rev 1646)
@@ -55,9 +55,9 @@
 			LIVE_OPTIONS="${LIVE_OPTIONS} --distribution ${DISTRIBUTION}"
 		fi
 
-		if [ -n "${FILESYSTEM}" ]
+		if [ -n "${CHROOT_FILESYSTEM}" ]
 		then
-			LIVE_OPTIONS="${LIVE_OPTIONS} --filesystem ${FILESYSTEM}"
+			LIVE_OPTIONS="${LIVE_OPTIONS} --chroot-filesystem ${CHROOT_FILESYSTEM}"
 		fi
 
 		if [ -n "${ISO_VOLUME}" ]

Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-23 14:58:33 UTC (rev 1645)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-23 15:55:04 UTC (rev 1646)
@@ -57,7 +57,7 @@
 head -n1`"
 	PACKAGES="`echo ${QUERY_STRING} | grep -oE '(^|[?&])packages=[0-9,a-z,A-Z,.,_,-,+]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
 
-	FILESYSTEM="`echo ${QUERY_STRING} | grep -oE '(^|[?&])filesystem=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1`"
+	CHROOT_FILESYSTEM="`echo ${QUERY_STRING} | grep -oE '(^|[?&])chroot_filesystem=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1`"
 	ISO_VOLUME="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_volume=[0-9,a-z,A-Z,.,_,-,+]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
 
 	# FIXME: filter invalid options
@@ -73,7 +73,7 @@
 	    -e "s/DISTRIBUTION/${DISTRIBUTION}/" \
 	    -e "s/PACKAGES_LISTS/${PACKAGES_LISTS}/" \
 	    -e "s/PACKAGES/${PACKAGES}/" \
-	    -e "s/FILESYSTEM/${FILESYSTEM}/" \
+	    -e "s/CHROOT_FILESYSTEM/${CHROOT_FILESYSTEM}/" \
 	    -e "s/ISO_VOLUME/${ISO_VOLUME}/" \
 	"${TEMPLATES}"/build.html
 
@@ -96,7 +96,7 @@
 PACKAGES_LISTS="${PACKAGES_LISTS}"
 PACKAGES="${PACKAGES}"
 
-FILESYSTEM="${FILESYSTEM}"
+CHROOT_FILESYSTEM="${CHROOT_FILESYSTEM}"
 ISO_VOLUME="${ISO_VOLUME}"
 EOF
 

Modified: dists/trunk/live-webbuilder/templates/build.html
===================================================================
--- dists/trunk/live-webbuilder/templates/build.html	2007-05-23 14:58:33 UTC (rev 1645)
+++ dists/trunk/live-webbuilder/templates/build.html	2007-05-23 15:55:04 UTC (rev 1646)
@@ -13,7 +13,7 @@
 	<tr><td>Email: </td><td>EMAIL</td></tr>
 	<tr><td>--binary-image: </td><td>BINARY_IMAGE</td></tr>
 	<tr><td>--distribution: </td><td>DISTRIBUTION</td></tr>
-	<tr><td>--fileystem: </td><td>FILESYSTEM</td></tr>
+	<tr><td>--chroot-fileystem: </td><td>CHROOT_FILESYSTEM</td></tr>
 	<tr><td>--iso-volume: </td><td>ISO_VOLUME</td></tr>
 	<tr><td>--packages-lists: </td><td>PACKAGES_LISTS</td></tr>
 	<tr><td>--packages: </td><td>PACKAGES</td><tr>

Modified: dists/trunk/live-webbuilder/templates/form.html
===================================================================
--- dists/trunk/live-webbuilder/templates/form.html	2007-05-23 14:58:33 UTC (rev 1645)
+++ dists/trunk/live-webbuilder/templates/form.html	2007-05-23 15:55:04 UTC (rev 1646)
@@ -90,9 +90,9 @@
 
 	<table>
 		<tr>
-			<td><label for="Filesystem">--<u>f</u>ilesystem:</label> </td>
+			<td><label for="Chroot_Filesystem">--chroot-<u>f</u>ilesystem:</label> </td>
 			<td>
-				<select accesskey="f" id="Filesystem" name="filesystem" size="1">
+				<select accesskey="f" id="Chroot_Filesystem" name="chroot_filesystem" size="1">
 					<option value="ext2">ext2</option>
 					<option value="plain">plain</option>
 					<option selected value="squashfs">squashfs</option>
@@ -100,8 +100,8 @@
 			</td>
 		</tr>
 		<tr>
-			<td><label for="ISO_Volume">--<u>i</u>so-volume:</label> </td>
-			<td><input accesskey="i" id="ISO_Volume" name="iso_volume" maxlength="200" size="50" type="text" /></td>
+			<td><label for="Iso_Volume">--<u>i</u>so-volume:</label> </td>
+			<td><input accesskey="i" id="Iso_Volume" name="iso_volume" maxlength="200" size="50" type="text" /></td>
 		</tr>
 	</table>
 </div>