[SCM] live-helper branch, debian-next, updated. debian/2.0_a15-1-33-g47a6440
Richard Nelson
unixabg at gmail.com
Wed Jun 23 15:32:06 UTC 2010
The following commit has been merged in the debian-next branch:
commit 47a6440e2e66d25cf782fd97b9a418da06919572
Author: Richard Nelson <unixabg at gmail.com>
Date: Wed Jun 23 10:28:03 2010 -0500
Removed username from forms and cgi and can be configured with live-config.username= on bootappend.
diff --git a/cgi/cgi b/cgi/cgi
index f1c7d29..da40e11 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -91,7 +91,6 @@ else
LH_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9a-z+]+' | cut -f 2 -d '=' | head -n1)
LH_NET_ROOT_PATH=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_path=[-0-9a-zA-Z._/]+' | cut -f 2 -d '=' | head -n1)
LH_NET_ROOT_SERVER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_server=[0-9.]+' | cut -f 2 -d '=' | head -n1)
- LH_USERNAME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])username=[-0-9a-zA-Z.]+' | cut -f 2 -d '=' | head -n1)
# Advanced source options
LH_SOURCE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1)
@@ -154,7 +153,6 @@ else
-e "s#LH_NET_ROOT_PATH#${LH_NET_ROOT_PATH}#" \
-e "s/LH_NET_ROOT_SERVER/${LH_NET_ROOT_SERVER}/" \
-e "s#SERVER#${_SERVER}#g" \
- -e "s/LH_USERNAME/${LH_USERNAME}/" \
-e "s/LH_SOURCE_IMAGES/${LH_SOURCE_IMAGES}/" \
-e "s/LH_SOURCE/${LH_SOURCE}/" \
-e "s#CUSTOM_BOOTSTRAP#${_CUSTOM_BOOTSTRAP}#" \
@@ -205,7 +203,6 @@ LH_ISO_VOLUME="${LH_ISO_VOLUME}"
LH_MEMTEST="${LH_MEMTEST}"
LH_NET_ROOT_PATH="${LH_NET_ROOT_PATH}"
LH_NET_ROOT_SERVER="${LH_NET_ROOT_SERVER}"
-LH_USERNAME="${LH_USERNAME}"
# Advanced source options
LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES}"
@@ -220,7 +217,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 ${LH_BOOTAPPEND}|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_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}|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_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 e0f3266..369b764 100644
--- a/templates/cgi/debian-official/build.html
+++ b/templates/cgi/debian-official/build.html
@@ -54,7 +54,6 @@
<tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
<tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
<tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
- <tr><td>--username: </td><td>LH_USERNAME</td></tr>
</table>
<b>Advanced source options</b>
diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index 85138b2..6facc1c 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -282,10 +282,6 @@
<td><input id="Net_Server" name="net_server" maxlength="15" size="50" type="text" value="192.168.1.1" /></td>
</tr>
<!-- LIVE_SYSLINUX_SPLASH -->
- <tr>
- <td><label for="Username">--username:</label> </td>
- <td><input id="Username" name="username" maxlength="128" size="50" type="text" value="user" /></td>
- </tr>
</table>
</div>
diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html
index 78d7bc6..78c4309 100644
--- a/templates/cgi/debian-unofficial/build.html
+++ b/templates/cgi/debian-unofficial/build.html
@@ -54,7 +54,6 @@
<tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
<tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
<tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
- <tr><td>--username: </td><td>LH_USERNAME</td></tr>
</table>
<b>Advanced source options</b>
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index ecf1558..e3bc4dc 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -281,10 +281,6 @@
<td><input id="Net_Server" name="net_server" maxlength="15" size="50" type="text" value="192.168.1.1" /></td>
</tr>
<!-- LIVE_SYSLINUX_SPLASH -->
- <tr>
- <td><label for="Username">--username:</label> </td>
- <td><input id="Username" name="username" maxlength="128" size="50" type="text" value="user" /></td>
- </tr>
</table>
</div>
--
live-helper
More information about the debian-live-changes
mailing list