summaryrefslogtreecommitdiff
path: root/helpers/binary_debian-installer
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-04-02 17:48:03 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:06 +0100
commit66a1f5f07ce832523c7527e7fe2119611aba6d09 (patch)
tree737df366cba90333966e404100002c8a1885b36e /helpers/binary_debian-installer
parent78a85f9b83a09109a0536e5986defe21bacbe003 (diff)
downloadvyos-live-build-66a1f5f07ce832523c7527e7fe2119611aba6d09.tar.gz
vyos-live-build-66a1f5f07ce832523c7527e7fe2119611aba6d09.zip
Making handling of cache/packages_bootstrap a bit more error proove, thanks to Michal Suchanek <michal.suchanek@ruk.cuni.cz> for bringing it up.
Diffstat (limited to 'helpers/binary_debian-installer')
-rwxr-xr-xhelpers/binary_debian-installer4
1 files changed, 2 insertions, 2 deletions
diff --git a/helpers/binary_debian-installer b/helpers/binary_debian-installer
index 5c224ae56..1cf79cd8d 100755
--- a/helpers/binary_debian-installer
+++ b/helpers/binary_debian-installer
@@ -415,14 +415,14 @@ then
if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
then
# Including base debian packages
- if [ -d cache/packages_bootstrap ]
+ if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
then
for FILE in cache/packages_bootstrap/*.deb
do
Install_file "${FILE}" "binary/pool/main"
done
else
- Echo_error "Could not find cache/packages_bootstrap."
+ Echo_error "Could not find packages in cache/packages_bootstrap."
Echo_error "You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached - these are required when integrating the Debian Installer."
exit 1
fi