summaryrefslogtreecommitdiff
path: root/helpers/bootstrap_debootstrap
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/bootstrap_debootstrap
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/bootstrap_debootstrap')
-rwxr-xr-xhelpers/bootstrap_debootstrap8
1 files changed, 2 insertions, 6 deletions
diff --git a/helpers/bootstrap_debootstrap b/helpers/bootstrap_debootstrap
index 2b708ba4c..d7662fa39 100755
--- a/helpers/bootstrap_debootstrap
+++ b/helpers/bootstrap_debootstrap
@@ -116,7 +116,7 @@ if [ -x "/usr/sbin/debootstrap" ]
then
if [ "${LH_CACHE_PACKAGES}" = "true" ]
then
- if [ -d cache/packages_bootstrap ]
+ if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
then
mkdir -p chroot/var/cache/apt/archives
cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
@@ -131,14 +131,10 @@ then
fi
# Removing old cache
- if [ -d cache/packages_bootstrap ]
- then
- rm -f cache/packages_bootstrap/*.deb
- fi
+ rm -f cache/packages_bootstrap/*.deb
# Saving new cache
mkdir -p cache/packages_bootstrap
-
cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
fi