summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2016-11-28 21:48:18 +0100
committerRaphaël Hertzog <hertzog@debian.org>2016-11-28 21:48:18 +0100
commita15b579652e64317fbcc0597a1ea1012fb1d3ba8 (patch)
treee0b9cadd77c494ad1f7c841436a6acc0fadfc308 /scripts
parentd8ca2041ad455aab3ecdcdc1083820b500e78e76 (diff)
downloadvyos-live-build-a15b579652e64317fbcc0597a1ea1012fb1d3ba8.tar.gz
vyos-live-build-a15b579652e64317fbcc0597a1ea1012fb1d3ba8.zip
Drop an optimization in chroot_archives that has undesired side-effects
Thanks to jnqnfe for the patch. Closes: #775989
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/chroot_archives11
1 files changed, 0 insertions, 11 deletions
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index cd27380f7..85ad35b0c 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -456,17 +456,6 @@ then
fi
# Configure generic indices
- # Don't do anything if it's not required
- if [ "${LB_PARENT_MIRROR_CHROOT}" = "${LB_PARENT_MIRROR_BINARY}" ] && \
- [ "${LB_PARENT_MIRROR_CHROOT_SECURITY}" = "${LB_PARENT_MIRROR_BINARY_SECURITY}" ] && \
- [ ! -d chroot/root/packages ]
- then
- # Removing stage file
- rm -f .build/chroot_archives
-
- exit 0
- fi
-
# Cleaning apt list cache
rm -rf chroot/var/lib/apt/lists
mkdir -p chroot/var/lib/apt/lists/partial