summaryrefslogtreecommitdiff
path: root/helpers/lh_chroot_tasks
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:52 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commitbd1a5ddc8203907eb40135303bea5488397ec5d0 (patch)
treee1cdc0adec3e4799f5db5ad1a8b34800e28a9439 /helpers/lh_chroot_tasks
parent8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1 (diff)
downloadvyos-live-build-bd1a5ddc8203907eb40135303bea5488397ec5d0.tar.gz
vyos-live-build-bd1a5ddc8203907eb40135303bea5488397ec5d0.zip
Adding live-helper 1.0~a8-1.
Diffstat (limited to 'helpers/lh_chroot_tasks')
-rwxr-xr-xhelpers/lh_chroot_tasks9
1 files changed, 5 insertions, 4 deletions
diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index 64cd47f35..0e096d4b5 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -25,10 +25,11 @@ Arguments "${@}"
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_tasks: Init"
@@ -48,7 +49,7 @@ Create_lockfile .lock
if [ -n "${LIVE_TASKS}" ]
then
# Restoring cache
- Restore_cache cache/chroot_tasks
+ Restore_cache cache/packages_tasks
# Checking depends
case "${LH_TASKSEL}" in
@@ -82,7 +83,7 @@ then
Remove_package
# Saving cache
- Save_cache cache/chroot_tasks
+ Save_cache cache/packages_tasks
# Creating stage file
Create_stagefile .stage/chroot_tasks