[SCM] live-helper branch, debian, updated. debian/2.0_a8-1-36-ga44b663
Daniel Baumann
daniel at debian.org
Fri Mar 12 15:25:14 UTC 2010
The following commit has been merged in the debian branch:
commit 89bf159942a9e5e9665ce3d7a820f67b8528b2d6
Author: Richard Nelson <unixabg at gmail.com>
Date: Mon Mar 8 14:07:59 2010 -0600
Updating variables for live-helper 2 in the cgi.
diff --git a/cgi/cgi b/cgi/cgi
index 2cbb56c..a3bee95 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -61,7 +61,7 @@ else
LH_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
LH_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
LH_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
- LH_SECTIONS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])sections=[a-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)
# Advanced chroot options
LH_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1)
@@ -128,7 +128,7 @@ else
-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_SECTIONS/${LH_SECTIONS}/" \
+ -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}/" \
@@ -177,7 +177,7 @@ 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_SECTIONS="${LH_SECTIONS}"
+LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"
# Advanced chroot options
LH_CHROOT_FILESYSTEM="${LH_CHROOT_FILESYSTEM}"
@@ -212,7 +212,7 @@ _CUSTOM_BINARY="${_CUSTOM_BINARY}"
EOF
echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-helper.cgi: add web build (${_BUILD})." >> /var/log/live
- echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-helper.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LH_BINARY_IMAGES}|distribution ${LH_DISTRIBUTION}|packages_lists ${LH_PACKAGES_LISTS}|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}|sections ${LH_SECTIONS}|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 ${LH_BOOTAPPEND}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|hostname ${LH_HOSTNAME}|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_NE
T_ROOT_SERVER}|username ${LH_USERNAME}|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-helper.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LH_BINARY_IMAGES}|distribution ${LH_DISTRIBUTION}|packages_lists ${LH_PACKAGES_LISTS}|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 ${LH_BOOTAPPEND}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|hostname ${LH_HOSTNAME}|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_serv
er ${LH_NET_ROOT_SERVER}|username ${LH_USERNAME}|source_images ${LH_SOURCE_IMAGES}|source ${LH_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/templates/cgi/debian-official/build.html b/templates/cgi/debian-official/build.html
index c134d8b..4759511 100644
--- a/templates/cgi/debian-official/build.html
+++ b/templates/cgi/debian-official/build.html
@@ -26,7 +26,7 @@
<tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
<tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
<tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
- <tr><td>--sections: </td><td>LH_SECTIONS</td></tr>
+ <tr><td>--archive-areas: </td><td>LH_ARCHIVE_AREAS</td></tr>
</table>
<b>Advanced chroot options</b>
diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index 645756d..9e4aa67 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -116,8 +116,8 @@
<td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY_SECURITY" readonly /></td>
</tr>
<tr>
- <td><label for="Sections">--sections:</label> </td>
- <td><input id="Sections" name="sections" maxlength="128" size="50" type="text" value="main" readonly /></td>
+ <td><label for="Archive_Areas">--archive-areas:</label> </td>
+ <td><input id="Archive_Areas" name="archive_areas" maxlength="128" size="50" type="text" value="main" readonly /></td>
</tr>
</table>
</div>
diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html
index f565b5c..d54db04 100644
--- a/templates/cgi/debian-unofficial/build.html
+++ b/templates/cgi/debian-unofficial/build.html
@@ -26,7 +26,7 @@
<tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
<tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
<tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
- <tr><td>--sections: </td><td>LH_SECTIONS</td></tr>
+ <tr><td>--archive-areas: </td><td>LH_ARCHIVE_AREAS</td></tr>
</table>
<b>Advanced chroot options</b>
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index bbe0c82..efd01e9 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -115,8 +115,8 @@
<td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY_SECURITY" readonly /></td>
</tr>
<tr>
- <td><label for="Sections">--sections:</label> </td>
- <td><input id="Sections" name="sections" maxlength="128" size="50" type="text" value="main" readonly /></td>
+ <td><label for="Archive_Areas">--archive-areas:</label> </td>
+ <td><input id="Archive_Areas" name="archive_areas" maxlength="128" size="50" type="text" value="main" readonly /></td>
</tr>
</table>
</div>
--
live-helper
More information about the debian-live-changes
mailing list