diff options
| author | Richard Nelson <unixabg@gmail.com> | 2012-08-04 20:00:05 -0500 |
|---|---|---|
| committer | Richard Nelson <unixabg@gmail.com> | 2012-08-04 20:00:05 -0500 |
| commit | b589256e88f9b4c5103f1513e0f0c441ab31f743 (patch) | |
| tree | 38ebe9f0b1bf1632cc26619162fb9dd20625b1d9 /frontends/cgi/live-build-cgi.cron | |
| parent | 12a2f17ea71bd726d8d6a5cd85466820e0f112fc (diff) | |
| download | vyos-live-build-b589256e88f9b4c5103f1513e0f0c441ab31f743.tar.gz vyos-live-build-b589256e88f9b4c5103f1513e0f0c441ab31f743.zip | |
Initial work to support --config git option.
Diffstat (limited to 'frontends/cgi/live-build-cgi.cron')
| -rwxr-xr-x | frontends/cgi/live-build-cgi.cron | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/frontends/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron index 876cec0d1..0035438e5 100755 --- a/frontends/cgi/live-build-cgi.cron +++ b/frontends/cgi/live-build-cgi.cron @@ -68,6 +68,8 @@ then _EMAIL=`awk -F\" '/^_EMAIL=/{print $2}' ${_FILE}` # Pull in cgipackages for config/package-lists/cgipackages.list.chroot _LB_CGIPACKAGES=`awk -F\" '/^_LB_CGIPACKAGES=/{print $2}' ${_FILE}` + # Pull in config for git clone + _LB_CONFIG=`awk -F\" '/^_LB_CONFIG=/{print $2}' ${_FILE}` # Pull in the remote address, atchitecture, distribution, and package-lists. _REMOTE_ADDR=`awk -F\" '/^REMOTE_ADDR=/{print $2}' ${_FILE}` _LB_ARCHITECTURES=`awk -F\" '/^LB_ARCHITECTURES=/{print $2}' ${_FILE}` @@ -80,6 +82,10 @@ then # Drop out some build data for information if something goes wrong. echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live + # Clone the git config to target build directory + git clone ${_LB_CONFIG} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live + _ERRORGIT="${?}" + # Creating build directory and the config/package-lists mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/package-lists @@ -106,10 +112,12 @@ then _DATE_START="`date -R`" echo "Begin: ${_DATE_START}" > "${_TEMPDIR}"/"${_BUILD}"/log - # Generating image + # Generating image here cd "${_TEMPDIR}"/"${_BUILD}" + # Stack on config file params to build dir lb config -c ${_FILE} >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1 _ERRORCONFIG="${?}" + # Run build lb build >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1 _ERRORBUILD="${?}" @@ -120,7 +128,7 @@ then mkdir -p "${_DESTDIR}"/"${_BUILD}" # Creating mail and logging. - if [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ] + if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ] then _STATUS="maybe-successful" echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURES}/${_LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds |