summaryrefslogtreecommitdiff
path: root/frontends
diff options
context:
space:
mode:
authorRichard Nelson <unixabg@gmail.com>2013-02-23 10:39:50 -0600
committerDaniel Baumann <daniel@debian.org>2013-04-09 05:52:08 +0200
commit8d777f7a659a4564a090bb6905a905715e0191bb (patch)
treeb584acd54d19fb650350deccf99319410bad3cf7 /frontends
parentc84dfffe31a9e5aaad6243f1f1004c8d460a5ce1 (diff)
downloadvyos-live-build-8d777f7a659a4564a090bb6905a905715e0191bb.tar.gz
vyos-live-build-8d777f7a659a4564a090bb6905a905715e0191bb.zip
Add _CGI_CONFIG_APPEND varialbe for appending options to lb config call on l-b-cgi frontend.
Diffstat (limited to 'frontends')
-rwxr-xr-xfrontends/cgi/live-build-cgi.cron2
-rw-r--r--frontends/cgi/live-build-cgi.default2
2 files changed, 3 insertions, 1 deletions
diff --git a/frontends/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron
index 391db4b77..e76147dc3 100755
--- a/frontends/cgi/live-build-cgi.cron
+++ b/frontends/cgi/live-build-cgi.cron
@@ -96,7 +96,7 @@ then
then
cd "${_BUILD_PATH}"
# Do config with git and stack on config file params to build
- lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
+ lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}" "${_CGI_CONFIG_APPEND}"
_ERRORCONFIG="${?}"
else
echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_BUILD_PATH}"/log
diff --git a/frontends/cgi/live-build-cgi.default b/frontends/cgi/live-build-cgi.default
index 41aa58dc4..a8ce7527a 100644
--- a/frontends/cgi/live-build-cgi.default
+++ b/frontends/cgi/live-build-cgi.default
@@ -13,3 +13,5 @@ _TEMPDIR="/srv/debian-live/build/tmp"
_SERVER="http://live.debian.net/build"
_LB_GIT="git://live-systems.org/git/live-images.git"
+
+_CGI_CONFIG_APPEND=""