summaryrefslogtreecommitdiff
path: root/frontends
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-08-13 12:23:34 +0200
committerDaniel Baumann <daniel@debian.org>2012-08-13 12:23:34 +0200
commitc68e06fb6b393755e88375cbaa2873aa2bc5c70f (patch)
tree27cb1f86e22a542f08ab53d0f2a186a10b931b80 /frontends
parent31d966cb49f6f952bfe710012a6cd643062d5803 (diff)
downloadvyos-live-build-c68e06fb6b393755e88375cbaa2873aa2bc5c70f.tar.gz
vyos-live-build-c68e06fb6b393755e88375cbaa2873aa2bc5c70f.zip
Simplyfing sourcing of build.sh and getting away with the broken subshell construct.
Diffstat (limited to 'frontends')
-rwxr-xr-xfrontends/cgi/live-build-cgi2
-rwxr-xr-xfrontends/cgi/live-build-cgi.cron2
2 files changed, 2 insertions, 2 deletions
diff --git a/frontends/cgi/live-build-cgi b/frontends/cgi/live-build-cgi
index 9925fe567..9ab5d2dbf 100755
--- a/frontends/cgi/live-build-cgi
+++ b/frontends/cgi/live-build-cgi
@@ -9,7 +9,7 @@
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+. "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || . /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 0035438e5..8e0e7ff87 100755
--- a/frontends/cgi/live-build-cgi.cron
+++ b/frontends/cgi/live-build-cgi.cron
@@ -9,7 +9,7 @@
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+. "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || . /usr/lib/live/build.sh
# Reading defaults
if [ -r /etc/default/live-build-cgi ]