diff options
| author | Richard Nelson <unixabg@gmail.com> | 2010-06-22 22:52:41 -0500 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:12 +0100 |
| commit | 1a31885b051c3a7c5c0fda13a4a047f54e5041c5 (patch) | |
| tree | 24862fe979c27b892a5a5547223523c06f56a4b6 | |
| parent | a1951fac411a429bc00bbe3f9265be4c0ec8e319 (diff) | |
| download | vyos-live-build-1a31885b051c3a7c5c0fda13a4a047f54e5041c5.tar.gz vyos-live-build-1a31885b051c3a7c5c0fda13a4a047f54e5041c5.zip | |
LH_USERNAME expression cleanup and build output cleanup.
| -rwxr-xr-x | cgi/cgi | 2 | ||||
| -rw-r--r-- | templates/cgi/debian-official/build.html | 2 | ||||
| -rw-r--r-- | templates/cgi/debian-unofficial/build.html | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -92,7 +92,7 @@ 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-9,a-z,A-Z,.,-]+' | 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) diff --git a/templates/cgi/debian-official/build.html b/templates/cgi/debian-official/build.html index 4759511e8..4d0d1247e 100644 --- a/templates/cgi/debian-official/build.html +++ b/templates/cgi/debian-official/build.html @@ -55,7 +55,7 @@ <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>username</td></tr> + <tr><td>--username: </td><td>LH_USERNAME</td></tr> </table> <b>Advanced source options</b> diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html index d54db044f..7ff57b0f0 100644 --- a/templates/cgi/debian-unofficial/build.html +++ b/templates/cgi/debian-unofficial/build.html @@ -55,7 +55,7 @@ <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>username</td></tr> + <tr><td>--username: </td><td>LH_USERNAME</td></tr> </table> <b>Advanced source options</b> |