[SCM] live-helper branch, debian, updated. debian/2.0_a17-1
Richard Nelson
unixabg at gmail.com
Fri Jul 2 16:25:39 UTC 2010
The following commit has been merged in the debian branch:
commit 7bf044f6eef62f6acbee0e67c21db3b6d422e074
Author: Richard Nelson <unixabg at gmail.com>
Date: Fri Jun 25 07:50:20 2010 -0500
LH_BOOTAPPEND_INSTALL added to cgi operations.
diff --git a/cgi/cgi b/cgi/cgi
index 6d72fe2..f02e213 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -80,6 +80,7 @@ else
# Advanced binary options
LH_BINARY_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LH_BOOTAPPEND_INSTALL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_install=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
LH_BOOTAPPEND_LIVE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_live=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
LH_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1)
LH_DEBIAN_INSTALLER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1)
@@ -141,6 +142,7 @@ else
-e "s/LH_SYMLINKS/${LH_SYMLINKS}/" \
-e "s/LH_SYSVINIT/${LH_SYSVINIT}/" \
-e "s/LH_BINARY_INDICES/${LH_BINARY_INDICES}/" \
+ -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#" \
-e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" \
-e "s/LH_BOOTLOADER/${LH_BOOTLOADER}/" \
-e "s/LH_DEBIAN_INSTALLER/${LH_DEBIAN_INSTALLER}/" \
@@ -192,6 +194,7 @@ LH_SYSVINIT="${LH_SYSVINIT}"
# Advanced binary options
LH_BINARY_INDICES="${LH_BINARY_INDICES}"
+LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL}"
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE}"
LH_BOOTLOADER="${LH_BOOTLOADER}"
LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
@@ -217,7 +220,7 @@ LH_REPOSITORIES="${LH_REPOSITORIES}"
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}|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_live ${LH_BOOTAPPEND_LIVE}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|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_NET_RO
OT_SERVER}|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_install ${LH_BOOTAPPEND_INSTALL}|bootappend_live ${LH_BOOTAPPEND_LIVE}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|iso_application ${LH_ISO_APPLICATION}|iso_preparer ${LH_ISO_PREPARER}|iso_publisher ${LH_ISO_PUBLISHER}|iso_volume ${LH_ISO_VOLUME}|memtest ${LH_MEMTEST}|net_pat
h ${LH_NET_ROOT_PATH}|net_server ${LH_NET_ROOT_SERVER}|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 8daa597..baabdc5 100644
--- a/templates/cgi/debian-official/build.html
+++ b/templates/cgi/debian-official/build.html
@@ -46,6 +46,7 @@
<tr><td>--bootappend-live: </td><td>LH_BOOTAPPEND_LIVE</td></tr>
<tr><td>--bootloader: </td><td>LH_BOOTLOADER</td></tr>
<tr><td>--debian-installer: </td><td>LH_DEBIAN_INSTALLER</td></tr>
+ <tr><td>--bootappend-install: </td><td>LH_BOOTAPPEND_INSTALL</td></tr>
<tr><td>--encryption: </td><td>LH_ENCRYPTION</td></tr>
<tr><td>--iso-application: </td><td>LH_ISO_APPLICATION</td></tr>
<tr><td>--iso-preparer: </td><td>LH_ISO_PREPARER</td></tr>
diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index 3e5a48c..3c4b8eb 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -236,6 +236,10 @@
</td>
</tr>
<tr>
+ <td><label for="Bootappend_Install">--bootappend-install:</label> </td>
+ <td><input id="Bootappend_Install" name="bootappend_install" maxlength="256" size="50" type="text" value="" /></td>
+ </tr>
+ <tr>
<td><label for="Encryption">--encryption:</label> </td>
<td>
<select id="Encryption" name="encryption" size="1">
diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html
index 5e9ff05..73d8a56 100644
--- a/templates/cgi/debian-unofficial/build.html
+++ b/templates/cgi/debian-unofficial/build.html
@@ -46,6 +46,7 @@
<tr><td>--bootappend-live: </td><td>LH_BOOTAPPEND_LIVE</td></tr>
<tr><td>--bootloader: </td><td>LH_BOOTLOADER</td></tr>
<tr><td>--debian-installer: </td><td>LH_DEBIAN_INSTALLER</td></tr>
+ <tr><td>--bootappend-install: </td><td>LH_BOOTAPPEND_INSTALL</td></tr>
<tr><td>--encryption: </td><td>LH_ENCRYPTION</td></tr>
<tr><td>--iso-application: </td><td>LH_ISO_APPLICATION</td></tr>
<tr><td>--iso-preparer: </td><td>LH_ISO_PREPARER</td></tr>
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index e8da497..0ed6cc3 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -235,6 +235,10 @@
</td>
</tr>
<tr>
+ <td><label for="Bootappend_Install">--bootappend-install:</label> </td>
+ <td><input id="Bootappend_Install" name="bootappend_install" maxlength="256" size="50" type="text" value="" /></td>
+ </tr>
+ <tr>
<td><label for="Encryption">--encryption:</label> </td>
<td>
<select id="Encryption" name="encryption" size="1">
--
live-helper
More information about the debian-live-changes
mailing list