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_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_packageslists')
| -rwxr-xr-x | helpers/lh_chroot_packageslists | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists index d1d9a13e3..3735d6bc4 100755 --- a/helpers/lh_chroot_packageslists +++ b/helpers/lh_chroot_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 packages lists 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_packageslists: Init" +Echo_message "Begin installing packages lists..." # Requiring stage file Require_stagefile .stage/bootstrap @@ -53,10 +53,10 @@ then for LIST in ${LIVE_PACKAGES_LISTS} do - if [ -f /usr/share/live-helper/lists/"${LIST}" ] + if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ] then # Copying package list - grep -v "^#" /usr/share/live-helper/lists/"${LIST}" > chroot/root/"${LIST}" + grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" > chroot/root/"${LIST}" # Installing package list case "${LH_APT}" in |