manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing LH_MIRROR_BOOTSTRAP_SECURITY in the cgi.

This commit is contained in:
Richard Nelson 2010-03-08 10:53:56 -06:00 committed by Daniel Baumann
parent 4a7eb86edd
commit 5c574a3bc9
6 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cgi/cgi
View File

@ -27,8 +27,7 @@ cat "${_TEMPLATES}"/header.html
if [ -z "${QUERY_STRING}" ] if [ -z "${QUERY_STRING}" ]
then then
# Sending html form # Sending html form
sed -e "s#LH_MIRROR_BOOTSTRAP_SECURITY#${LH_MIRROR_BOOTSTRAP_SECURITY}#" \ sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
-e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
-e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \ -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
-e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \ -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
-e "s/VERSION/${VERSION}/" \ -e "s/VERSION/${VERSION}/" \
@ -60,7 +59,6 @@ else
LH_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architecture=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1) LH_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architecture=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1)
LH_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1) LH_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1)
LH_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1) LH_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
LH_MIRROR_BOOTSTRAP_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
LH_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1) LH_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
LH_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1) LH_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
LH_SECTIONS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])sections=[a-z]+' | cut -f 2 -d '=' | head -n1) LH_SECTIONS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])sections=[a-z]+' | cut -f 2 -d '=' | head -n1)
@ -103,8 +101,7 @@ else
then then
echo "<h2><div style='color: red;'>Error: No email address specified.</div></h2>" echo "<h2><div style='color: red;'>Error: No email address specified.</div></h2>"
sed -e "s#LH_MIRROR_BOOTSTRAP_SECURITY#${LH_MIRROR_BOOTSTRAP_SECURITY}#" \ sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
-e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
-e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \ -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
-e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \ -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
-e "s/VERSION/${VERSION}/" \ -e "s/VERSION/${VERSION}/" \
@ -128,7 +125,6 @@ else
-e "s/LH_PACKAGES/${LH_PACKAGES}/" \ -e "s/LH_PACKAGES/${LH_PACKAGES}/" \
-e "s/LH_ARCHITECTURE/${LH_ARCHITECTURE}/" \ -e "s/LH_ARCHITECTURE/${LH_ARCHITECTURE}/" \
-e "s/LH_BOOTSTRAP_FLAVOUR/${LH_BOOTSTRAP_FLAVOUR}/" \ -e "s/LH_BOOTSTRAP_FLAVOUR/${LH_BOOTSTRAP_FLAVOUR}/" \
-e "s#LH_MIRROR_BOOTSTRAP_SECURITY#${LH_MIRROR_BOOTSTRAP_SECURITY}#" \
-e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \ -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
-e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \ -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
-e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \ -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
@ -178,7 +174,6 @@ LH_PACKAGES="${LH_PACKAGES}"
# Advanced bootstrap options # Advanced bootstrap options
LH_ARCHITECTURE="${LH_ARCHITECTURE}" LH_ARCHITECTURE="${LH_ARCHITECTURE}"
LH_MIRROR_BOOTSTRAP_SECURITY="${LH_MIRROR_BOOTSTRAP}"
LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}" LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}"
LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}" LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
LH_MIRROR_BINARY="${LH_MIRROR_BINARY}" LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"

1
cgi/default
View File

@ -11,7 +11,6 @@ _TEMPLATES="/usr/share/live-helper/templates/cgi/${_MODE}"
_TEMPDIR="/srv/debian-live/build/tmp" _TEMPDIR="/srv/debian-live/build/tmp"
LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/" LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
LH_MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
LH_MIRROR_BINARY="http://ftp.debian.org/debian/" LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
LH_MIRROR_BINARY_SECURITY="http://security.debian.org/" LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"

1
templates/cgi/debian-official/build.html
View File

@ -29,7 +29,6 @@
<tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr> <tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr>
<tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr> <tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr>
<tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr> <tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
<tr><td>--mirror-bootstrap-security: </td><td>LH_MIRROR_BOOTSTRAP_SECURITY</td></tr>
<tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr> <tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
<tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr> <tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
<tr><td>--sections: </td><td>LH_SECTIONS</td></tr> <tr><td>--sections: </td><td>LH_SECTIONS</td></tr>

4
templates/cgi/debian-official/form.html
View File

@ -111,10 +111,6 @@
<td><label for="Mirror_Bootstrap">--mirror-bootstrap:</label> </td> <td><label for="Mirror_Bootstrap">--mirror-bootstrap:</label> </td>
<td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td> <td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td>
</tr> </tr>
<tr>
<td><label for="Mirror_Bootstrap_Security">--mirror-bootstrap-security:</label> </td>
<td><input id="Mirror_Bootstrap_Security" name="mirror_bootstrap_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP_SECURITY" readonly /></td>
</tr>
<tr> <tr>
<td><label for="Mirror_Binary">--mirror-binary:</label> </td> <td><label for="Mirror_Binary">--mirror-binary:</label> </td>
<td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" readonly /></td> <td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" readonly /></td>

1
templates/cgi/debian-unofficial/build.html
View File

@ -29,7 +29,6 @@
<tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr> <tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr>
<tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr> <tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr>
<tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr> <tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
<tr><td>--mirror-bootstrap-security: </td><td>LH_MIRROR_BOOTSTRAP_SECURITY</td></tr>
<tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr> <tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
<tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr> <tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
<tr><td>--sections: </td><td>LH_SECTIONS</td></tr> <tr><td>--sections: </td><td>LH_SECTIONS</td></tr>

4
templates/cgi/debian-unofficial/form.html
View File

@ -111,10 +111,6 @@
<td><label for="Mirror_Bootstrap">--mirror-bootstrap:</label> </td> <td><label for="Mirror_Bootstrap">--mirror-bootstrap:</label> </td>
<td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td> <td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td>
</tr> </tr>
<tr>
<td><label for="Mirror_Bootstrap_Security">--mirror-bootstrap-security:</label> </td>
<td><input id="Mirror_Bootstrap_Security" name="mirror_bootstrap_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP_SECURITY" readonly /></td>
</tr>
<tr> <tr>
<td><label for="Mirror_Binary">--mirror-binary:</label> </td> <td><label for="Mirror_Binary">--mirror-binary:</label> </td>
<td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" readonly /></td> <td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" readonly /></td>