summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Nelson <unixabg@gmail.com>2014-09-21 19:28:16 -0500
committerRichard Nelson <unixabg@gmail.com>2014-09-21 19:28:16 -0500
commite2a9114cb3409037085fc00f55e82ec2afe37716 (patch)
treec47311e7cd013427ee227994e78bb129b5168509
parentbf8c367e025db8b0e914f19f9ec20930966da3b9 (diff)
downloadvyos-live-build-e2a9114cb3409037085fc00f55e82ec2afe37716.tar.gz
vyos-live-build-e2a9114cb3409037085fc00f55e82ec2afe37716.zip
Correct variable name for apt_indices and adjust sed order for population of build feedback on frontend/cgi.
-rwxr-xr-xfrontend/cgi/live-build-cgi2
-rw-r--r--templates/cgi/debian/form.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/frontend/cgi/live-build-cgi b/frontend/cgi/live-build-cgi
index b68d34c39..c2b56ce1b 100755
--- a/frontend/cgi/live-build-cgi
+++ b/frontend/cgi/live-build-cgi
@@ -136,6 +136,7 @@ else
-e "s/LIVE_IMAGE_TYPE/${LIVE_IMAGE_TYPE}/" \
-e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \
-e "s#_LB_CONFIG#${_LB_CONFIG}#" \
+ -e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \
-e "s/LB_APT/${LB_APT}/" \
-e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \
-e "s/LIVE_IMAGE_ARCHITECTURE/${LIVE_IMAGE_ARCHITECTURE}/" \
@@ -143,7 +144,6 @@ else
-e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \
-e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \
-e "s/LB_SECURITY/${LB_SECURITY}/" \
- -e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \
-e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \
-e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \
-e "s/LB_BOOTLOADER/${LB_BOOTLOADER}/" \
diff --git a/templates/cgi/debian/form.html b/templates/cgi/debian/form.html
index 011fd632f..d8c76e865 100644
--- a/templates/cgi/debian/form.html
+++ b/templates/cgi/debian/form.html
@@ -158,7 +158,7 @@
<tr>
<td><label for="Apt_Indices">--apt-indices:</label> </td>
<td>
- <select id="Apt_Indices" name="binary_indices" size="1">
+ <select id="Apt_Indices" name="apt_indices" size="1">
<option selected value="true">true</option>
<option value="false">false</option>
</select>