diff options
| author | Richard Nelson <unixabg@gmail.com> | 2013-02-23 10:39:50 -0600 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:06 +0200 |
| commit | 6a113f7b8eccd7840a2cb7faab5ab7e895bde967 (patch) | |
| tree | a87071b0c4ea8c79fccf58ebb03751ca73b6a6f5 /frontends | |
| parent | 391c9033844fb7b8893b2cc019c7252d605550bd (diff) | |
| download | vyos-live-build-6a113f7b8eccd7840a2cb7faab5ab7e895bde967.tar.gz vyos-live-build-6a113f7b8eccd7840a2cb7faab5ab7e895bde967.zip | |
Add _CGI_CONFIG_APPEND varialbe for appending options to lb config call on l-b-cgi frontend.
Diffstat (limited to 'frontends')
| -rwxr-xr-x | frontends/cgi/live-build-cgi.cron | 2 | ||||
| -rw-r--r-- | frontends/cgi/live-build-cgi.default | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/frontends/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron index dd42a0863..dc6531b73 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 "${LIVE_IMAGE_ARCHITECTURE}" --archive-areas "${LIVE_IMAGE_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 "${LIVE_IMAGE_ARCHITECTURE}" --archive-areas "${LIVE_IMAGE_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="" |