diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-04-18 14:43:23 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:06 +0100 |
| commit | 8b3eed6b3f96abe66d1c91273edd5921f11d3501 (patch) | |
| tree | 3daf6ccc7e427ae0e790d974479013fbed66a79d | |
| parent | d1612f05af3e2ddeaaecf1271d30e8cd7a28d348 (diff) | |
| download | vyos-live-build-8b3eed6b3f96abe66d1c91273edd5921f11d3501.tar.gz vyos-live-build-8b3eed6b3f96abe66d1c91273edd5921f11d3501.zip | |
Making sure live-helper.sh is sourced early enough wrt/ auto scripts.
| -rwxr-xr-x | helpers/clean | 6 | ||||
| -rwxr-xr-x | helpers/config | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/helpers/clean b/helpers/clean index 77fa1ab28..6cafc6d49 100755 --- a/helpers/clean +++ b/helpers/clean @@ -9,6 +9,9 @@ set -e +# Including common functions +. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh + # Read meta config if [ "${1}" != "noauto" ] && [ -x auto/clean ] then @@ -21,9 +24,6 @@ then shift fi -# Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh - # Setting static variables DESCRIPTION="$(Echo 'clean up system build directories')" HELP="" diff --git a/helpers/config b/helpers/config index e2eff0844..a341af64d 100755 --- a/helpers/config +++ b/helpers/config @@ -9,6 +9,9 @@ set -e +# Including common functions +. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh + # Read meta config if [ "${1}" != "noauto" ] && [ -x auto/config ] then @@ -21,9 +24,6 @@ then shift fi -# Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh - # Setting static variables SYSTEM_LH_CONFFILE="/etc/default/live-helper" DESCRIPTION="$(Echo 'create configuration for live-helper(7)')" |