summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Nelson <unixabg@gmail.com>2013-05-10 14:29:03 -0500
committerRichard Nelson <unixabg@gmail.com>2013-05-10 14:29:03 -0500
commit39cf68130ebfc9f52968263b112de4f18b912569 (patch)
treed77af62e9b74e9b5a6bbdf184ad71f660b52d782
parent89d3b33f4995db4ee8077c2c5f98cdb984880329 (diff)
downloadvyos-live-build-39cf68130ebfc9f52968263b112de4f18b912569.tar.gz
vyos-live-build-39cf68130ebfc9f52968263b112de4f18b912569.zip
Modified l-b-cgi cron to move submitted build file to temporary build directory after reading.
-rwxr-xr-xfrontends/cgi/live-build-cgi.cron7
1 files changed, 5 insertions, 2 deletions
diff --git a/frontends/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron
index 7f661002a..1b9d460a2 100755
--- a/frontends/cgi/live-build-cgi.cron
+++ b/frontends/cgi/live-build-cgi.cron
@@ -70,6 +70,9 @@ then
git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
_ERRORGIT="${?}"
+ # Moving build file to the tempdir and remove from submission area.
+ mv "${_TEMPDIR}"/"${_BUILD}".build "${_TEMPDIR}"/"${_BUILD}"/
+
# Sanity check to default to something since we are going to build from git clone.
if [ -z "${_LB_CONFIG}" ]
then
@@ -145,7 +148,7 @@ Here's a list of all build-options that were used to build your image:
EOF
- cat "${_TEMPDIR}"/"${_BUILD}".build >> "${_DESTDIR}"/"${_BUILD}"/mail
+ cat "${_TEMPDIR}"/"${_BUILD}"/"${_BUILD}".build >> "${_DESTDIR}"/"${_BUILD}"/mail
# Moving binary image
#if ls "${_TEMPDIR}"/"${_BUILD}"/binary*.* > /dev/null 2>&1
@@ -162,7 +165,7 @@ EOF
fi
# Moving build
- mv "${_TEMPDIR}"/"${_BUILD}".build "${_DESTDIR}"/"${_BUILD}"/build
+ mv "${_TEMPDIR}"/"${_BUILD}"/"${_BUILD}".build "${_DESTDIR}"/"${_BUILD}"/build
# Moving log
mv "${_BUILD_PATH}"/log "${_DESTDIR}"/"${_BUILD}"