diff options
| -rwxr-xr-x | cgi/cgi | 5 | ||||
| -rw-r--r-- | templates/cgi/debian-official/build.html | 1 | ||||
| -rw-r--r-- | templates/cgi/debian-official/form.html | 4 | ||||
| -rw-r--r-- | templates/cgi/debian-unofficial/build.html | 1 | ||||
| -rw-r--r-- | templates/cgi/debian-unofficial/form.html | 4 |
5 files changed, 1 insertions, 14 deletions
@@ -84,7 +84,6 @@ else 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) LH_ENCRYPTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])encryption=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) - LH_HOSTNAME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])hostname=[-0-9a-zA-Z.]+' | cut -f 2 -d '=' | head -n1) LH_ISO_APPLICATION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_application=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1) LH_ISO_PREPARER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_preparer=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1) LH_ISO_PUBLISHER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_publisher=[-0-9a-zA-Z. ~;:/_@]+' | cut -f 2 -d '=' | head -n1) @@ -147,7 +146,6 @@ else -e "s/LH_BOOTLOADER/${LH_BOOTLOADER}/" \ -e "s/LH_DEBIAN_INSTALLER/${LH_DEBIAN_INSTALLER}/" \ -e "s/LH_ENCRYPTION/${LH_ENCRYPTION}/" \ - -e "s/LH_HOSTNAME/${LH_HOSTNAME}/" \ -e "s#LH_ISO_APPLICATION#${LH_ISO_APPLICATION}#" \ -e "s#LH_ISO_PREPARER#${LH_ISO_PREPARER}#" \ -e "s#LH_ISO_PUBLISHER#${LH_ISO_PUBLISHER}#" \ @@ -200,7 +198,6 @@ LH_BOOTAPPEND="${LH_BOOTAPPEND}" LH_BOOTLOADER="${LH_BOOTLOADER}" LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}" LH_ENCRYPTION="${LH_ENCRYPTION}" -LH_HOSTNAME="${LH_HOSTNAME}" LH_ISO_APPLICATION="${LH_ISO_APPLICATION}" LH_ISO_PREPARER="${LH_ISO_PREPARER}" LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER}" @@ -223,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 ${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_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}|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 4d0d1247e..e0f326674 100644 --- a/templates/cgi/debian-official/build.html +++ b/templates/cgi/debian-official/build.html @@ -47,7 +47,6 @@ <tr><td>--bootloader: </td><td>LH_BOOTLOADER</td></tr> <tr><td>--debian-installer: </td><td>LH_DEBIAN_INSTALLER</td></tr> <tr><td>--encryption: </td><td>LH_ENCRYPTION</td></tr> - <tr><td>--hostname: </td><td>LH_HOSTNAME</td></tr> <tr><td>--iso-application: </td><td>LH_ISO_APPLICATION</td></tr> <tr><td>--iso-preparer: </td><td>LH_ISO_PREPARER</td></tr> <tr><td>--iso-publisher: </td><td>LH_ISO_PUBLISHER</td></tr> diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html index e2f867196..85138b26d 100644 --- a/templates/cgi/debian-official/form.html +++ b/templates/cgi/debian-official/form.html @@ -248,10 +248,6 @@ </tr> <!-- LIVE_GRUB_SPLASH --> <tr> - <td><label for="Hostname">--hostname:</label> </td> - <td><input id="Hostname" name="hostname" maxlength="128" size="50" type="text" value="debian" /></td> - </tr> - <tr> <td><label for="Iso_Application">--iso-application:</label> </td> <td><input id="Iso_Application" name="iso_application" maxlength="128" size="50" type="text" value="Debian Live" /></td> </tr> diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html index 7ff57b0f0..78d7bc6d3 100644 --- a/templates/cgi/debian-unofficial/build.html +++ b/templates/cgi/debian-unofficial/build.html @@ -47,7 +47,6 @@ <tr><td>--bootloader: </td><td>LH_BOOTLOADER</td></tr> <tr><td>--debian-installer: </td><td>LH_DEBIAN_INSTALLER</td></tr> <tr><td>--encryption: </td><td>LH_ENCRYPTION</td></tr> - <tr><td>--hostname: </td><td>LH_HOSTNAME</td></tr> <tr><td>--iso-application: </td><td>LH_ISO_APPLICATION</td></tr> <tr><td>--iso-preparer: </td><td>LH_ISO_PREPARER</td></tr> <tr><td>--iso-publisher: </td><td>LH_ISO_PUBLISHER</td></tr> diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html index 602f99516..ecf155865 100644 --- a/templates/cgi/debian-unofficial/form.html +++ b/templates/cgi/debian-unofficial/form.html @@ -247,10 +247,6 @@ </tr> <!-- LIVE_GRUB_SPLASH --> <tr> - <td><label for="Hostname">--hostname:</label> </td> - <td><input id="Hostname" name="hostname" maxlength="128" size="50" type="text" value="debian" /></td> - </tr> - <tr> <td><label for="Iso_Application">--iso-application:</label> </td> <td><input id="Iso_Application" name="iso_application" maxlength="128" size="50" type="text" value="Debian Live" /></td> </tr> |