diff options
| -rwxr-xr-x | cgi/cgi | 8 | ||||
| -rw-r--r-- | templates/cgi/debian-official/build.html | 2 | ||||
| -rw-r--r-- | templates/cgi/debian-official/form.html | 4 | ||||
| -rw-r--r-- | templates/cgi/debian-unofficial/build.html | 2 | ||||
| -rw-r--r-- | templates/cgi/debian-unofficial/form.html | 4 |
5 files changed, 10 insertions, 10 deletions
@@ -80,7 +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=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend=[-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) LH_ENCRYPTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])encryption=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) @@ -141,7 +141,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#${LH_BOOTAPPEND}#" \ + -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" \ -e "s/LH_BOOTLOADER/${LH_BOOTLOADER}/" \ -e "s/LH_DEBIAN_INSTALLER/${LH_DEBIAN_INSTALLER}/" \ -e "s/LH_ENCRYPTION/${LH_ENCRYPTION}/" \ @@ -192,7 +192,7 @@ LH_SYSVINIT="${LH_SYSVINIT}" # Advanced binary options LH_BINARY_INDICES="${LH_BINARY_INDICES}" -LH_BOOTAPPEND="${LH_BOOTAPPEND}" +LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE}" LH_BOOTLOADER="${LH_BOOTLOADER}" LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}" LH_ENCRYPTION="${LH_ENCRYPTION}" @@ -217,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}|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_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_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 369b764ab..8daa59746 100644 --- a/templates/cgi/debian-official/build.html +++ b/templates/cgi/debian-official/build.html @@ -43,7 +43,7 @@ <table> <tr><td>--binary-indices: </td><td>LH_BINARY_INDICES</td></tr> - <tr><td>--bootappend: </td><td>LH_BOOTAPPEND</td></tr> + <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>--encryption: </td><td>LH_ENCRYPTION</td></tr> diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html index 6facc1cef..3e5a48c42 100644 --- a/templates/cgi/debian-official/form.html +++ b/templates/cgi/debian-official/form.html @@ -214,8 +214,8 @@ </td> </tr> <tr> - <td><label for="Bootappend">--bootappend:</label> </td> - <td><input id="Bootappend" name="bootappend" maxlength="256" size="50" type="text" value="" /></td> + <td><label for="Bootappend_Live">--bootappend-live:</label> </td> + <td><input id="Bootappend_Live" name="bootappend_live" maxlength="256" size="50" type="text" value="" /></td> </tr> <tr> <td><label for="Bootloader">--bootloader:</label> </td> diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html index 78c4309f3..5e9ff051f 100644 --- a/templates/cgi/debian-unofficial/build.html +++ b/templates/cgi/debian-unofficial/build.html @@ -43,7 +43,7 @@ <table> <tr><td>--binary-indices: </td><td>LH_BINARY_INDICES</td></tr> - <tr><td>--bootappend: </td><td>LH_BOOTAPPEND</td></tr> + <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>--encryption: </td><td>LH_ENCRYPTION</td></tr> diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html index e3bc4dc3a..e8da4973a 100644 --- a/templates/cgi/debian-unofficial/form.html +++ b/templates/cgi/debian-unofficial/form.html @@ -213,8 +213,8 @@ </td> </tr> <tr> - <td><label for="Bootappend">--bootappend:</label> </td> - <td><input id="Bootappend" name="bootappend" maxlength="256" size="50" type="text" value="" /></td> + <td><label for="Bootappend_Live">--bootappend-live:</label> </td> + <td><input id="Bootappend_Live" name="bootappend_live" maxlength="256" size="50" type="text" value="" /></td> </tr> <tr> <td><label for="Bootloader">--bootloader:</label> </td> |