summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2010-02-01 12:36:00 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:03 +0100
commit59e9a93ad08c171fb0d22e965c56f91c5bd17615 (patch)
treeacb8cb8e5fd486c94ed1c335718f086291b715c3 /helpers
parentaa2c9f94da106dcb175453c5eedf09b7be532348 (diff)
downloadvyos-live-build-59e9a93ad08c171fb0d22e965c56f91c5bd17615.tar.gz
vyos-live-build-59e9a93ad08c171fb0d22e965c56f91c5bd17615.zip
For lh_local, checking first for helpers in LH_BASE.
lh_local sets PATH and LH_BASE. However the live-helper wrapper script looks for helper script in the system path (/usr/share/live-helper/helpers) before looking for them in the PATH. This patch thus instructs lh to first adds test under LH_BASE, if set.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh5
1 files changed, 4 insertions, 1 deletions
diff --git a/helpers/lh b/helpers/lh
index ecf9b4ad5..c22f554d6 100755
--- a/helpers/lh
+++ b/helpers/lh
@@ -34,7 +34,10 @@ case "${1}" in
COMMAND="${1}"
shift
- if [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ]
+ if [ -x "${LH_BASE}/helpers/lh_${COMMAND}" ]
+ then
+ LH=1 exec "${LH_BASE}/helpers/lh_${COMMAND}" "${@}"
+ elif [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ]
then
LH=1 exec /usr/share/live-helper/helpers/lh_"${COMMAND}" "${@}"
elif [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]