[SCM] debian-live/live-helper branch, master, updated. 1.0_a44-1-16-gef8df9b

[Daniel Baumann]

The following commit has been merged in the master branch:
commit ef8df9bcadc48935f709453c086d7aba04f35d84
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Apr 17 21:28:51 2008 +0100

    Allow fallback to chroot_package-lists inside binary lists
    
    Without this, a modified version of the (say) "gnome" list inside
    chroot_package-lists would be completely ignored when installing binary
    packagelists.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists
index 869e6bf..5b8927a 100755
--- a/helpers/lh_binary_local-packageslists
+++ b/helpers/lh_binary_local-packageslists
@@ -51,7 +51,7 @@ then
 	for PACKAGESLIST in config/binary_local-packageslists/*
 	do
 		# Generate package list
-		Expand_packagelist "${PACKAGESLIST}" "config/binary_local-packageslists" > chroot/root/"$(basename ${PACKAGESLIST})"
+		Expand_packagelist "${PACKAGESLIST}" "config/binary_local-packageslists" "config/chroot_local-packageslists" > chroot/root/"$(basename ${PACKAGESLIST})"
 
 		# Downloading additional packages
 		Chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"

-- 
debian-live/live-helper