diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:11 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:18:30 +0100 |
| commit | 85c342c299231131d22764c0dfdcf977c57ce147 (patch) | |
| tree | 1226c8a7ad43a2dd53e411c2e379969424e88e32 /helpers/lh_chroot_local-packageslists | |
| parent | d1ee66e44c8272bb7a0053a456a3d8b0bd152268 (diff) | |
| download | vyos-live-build-85c342c299231131d22764c0dfdcf977c57ce147.tar.gz vyos-live-build-85c342c299231131d22764c0dfdcf977c57ce147.zip | |
Adding live-helper 1.0~a13-1.
Diffstat (limited to 'helpers/lh_chroot_local-packageslists')
| -rwxr-xr-x | helpers/lh_chroot_local-packageslists | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists index f358fca87..ed914abd7 100755 --- a/helpers/lh_chroot_local-packageslists +++ b/helpers/lh_chroot_local-packageslists @@ -9,21 +9,21 @@ set -e -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh do - . ${FUNCTION} + . "${FUNCTION}" done -# Set static variables +# Setting static variables DESCRIPTION="install local packages into chroot" HELP="" USAGE="${PROGRAM} [--force]" Arguments "${@}" -Echo_debug "Init ${PROGRAM}" - # Reading configuration files Read_conffile config/common Read_conffile config/bootstrap @@ -32,7 +32,7 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "chroot_local-packageslists: Init" +Echo_message "Begin installing local packages lists..." # Requiring stage file Require_stagefile .stage/bootstrap @@ -46,7 +46,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if ls config/chroot_local-packageslists/* &> /dev/null +if ls config/chroot_local-packageslists/* > /dev/null 2>&1 then # Restoring cache Restore_cache cache/packages_local-packageslists |