diff options
Diffstat (limited to 'helpers/lh_chroot_local-packageslists')
| -rwxr-xr-x | helpers/lh_chroot_local-packageslists | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists index ac21f09..8a1bef0 100755 --- a/helpers/lh_chroot_local-packageslists +++ b/helpers/lh_chroot_local-packageslists @@ -1,6 +1,6 @@ #!/bin/sh -# lh_chroot_local-packageslists(1) - install local packages lists into chroot +# lh_chroot_local-packageslists(1) - queue install of local packages lists into chroot # Copyright (C) 2006-2008 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -18,7 +18,7 @@ do done # Setting static variables -DESCRIPTION="install local packages into chroot" +DESCRIPTION="queue install of local packages lists into chroot" HELP="" USAGE="${PROGRAM} [--force]" @@ -28,7 +28,7 @@ Arguments "${@}" Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -Echo_message "Begin installing local packages lists..." +Echo_message "Begin queueing installation of local packages lists..." # Requiring stage file Require_stagefile .stage/bootstrap @@ -44,32 +44,16 @@ Create_lockfile .lock if ls config/chroot_local-packageslists/* > /dev/null 2>&1 then - # Restoring cache - Restore_cache cache/packages_local-packageslists - - for PACKAGESLIST in config/chroot_local-packageslists/* + for PACKAGES_LIST in config/chroot_local-packageslists/* do # Generate package list - Expand_packagelist "$(basename ${PACKAGESLIST})" "config/chroot_local-packageslists" "${LH_BASE:-/usr/share/live-helper/lists}/lists" > chroot/root/"$(basename ${PACKAGESLIST})" - - # Installing package list - case "${LH_APT}" in - apt|apt-get) - Chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) apt-get ${APT_OPTIONS} install" - ;; - - aptitude) - Chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) aptitude ${APTITUDE_OPTIONS} install" - ;; - esac - - # Removing package list - rm -f chroot/root/"$(basename ${PACKAGESLIST})" + Expand_packagelist \ + "$(basename ${PACKAGES_LIST})" \ + "config/chroot_local-packageslists" \ + "${LH_BASE:-/usr/share/live-helper/lists}/lists" \ + >> chroot/root/chroot_packages done - # Saving cache - Save_cache cache/packages_local-packageslists - # Creating stage file Create_stagefile .stage/chroot_local-packageslists fi |