summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-04-17 21:28:51 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:32 +0100
commitac27ecc2e0a5fb87fbf580da991cecc3b586c43e (patch)
tree86a6a5ede7bbf656cfc07d6468d35453395d2a64
parentefa7c76589822988442fa80582282fb6a97cbcfc (diff)
downloadvyos-live-build-ac27ecc2e0a5fb87fbf580da991cecc3b586c43e.tar.gz
vyos-live-build-ac27ecc2e0a5fb87fbf580da991cecc3b586c43e.zip
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.
-rwxr-xr-xhelpers/lh_binary_local-packageslists2
1 files changed, 1 insertions, 1 deletions
diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists
index 869e6bf71..5b8927a5d 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"