diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-19 19:37:26 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-19 21:11:59 +0200 |
| commit | 8473b925fd94fdb7bb1ae6309a4ab58d490382c9 (patch) | |
| tree | 94b76a6288395e37619b900f3eea2009a25d9b28 /frontends | |
| parent | 6c0ddb7d6d72d15ab2887a4b40de2c5d71f26d3a (diff) | |
| download | vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.tar.gz vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.zip | |
Fixing up inclusion of functions while allowing local usage of live-build with different file layouts.
Diffstat (limited to 'frontends')
| -rwxr-xr-x | frontends/cgi/live-build-cgi | 2 | ||||
| -rwxr-xr-x | frontends/cgi/live-build-cgi.cron | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/frontends/cgi/live-build-cgi b/frontends/cgi/live-build-cgi index 356918fcf..587be6c9d 100755 --- a/frontends/cgi/live-build-cgi +++ b/frontends/cgi/live-build-cgi @@ -9,7 +9,7 @@ # Including common functions -. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh +( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh # Reading defaults if [ -r /etc/default/live-build-cgi ] diff --git a/frontends/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron index a81de39a0..c8d966457 100755 --- a/frontends/cgi/live-build-cgi.cron +++ b/frontends/cgi/live-build-cgi.cron @@ -9,7 +9,7 @@ # Including common functions -. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh +( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh # Reading defaults if [ -r /etc/default/live-build-cgi ] |