diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2016-11-28 21:48:18 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2016-11-28 21:48:18 +0100 |
| commit | a15b579652e64317fbcc0597a1ea1012fb1d3ba8 (patch) | |
| tree | e0b9cadd77c494ad1f7c841436a6acc0fadfc308 | |
| parent | d8ca2041ad455aab3ecdcdc1083820b500e78e76 (diff) | |
| download | vyos-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
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 33ee3eafd..9301dbfc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ live-build (1:20160105) UNRELEASED; urgency=medium * Manual pages updates by jnqnfe. Closes: #774730 * Drop left-over translation files for removed lb_testroot command. * Get rid of useless bootstrap_archive-keys script. Closes: #773775 + * Drop an optimization in chroot_archives that has undesired side-effects. + Thanks to jnqnfe for the patch. Closes: #775989 [ Kristian Klausen ] * Include ext{3,4} journal size when calculating image size. Closes: #801712 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 |