manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop an optimization in chroot_archives that has undesired side-effects 

Thanks to jnqnfe for the patch.

Closes: #775989
This commit is contained in:
Raphaël Hertzog 2016-11-28 21:48:18 +01:00
parent d8ca2041ad
commit a15b579652
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -31,6 +31,8 @@ live-build (1:20160105) UNRELEASED; urgency=medium
* Manual pages updates by jnqnfe. Closes: #774730 * Manual pages updates by jnqnfe. Closes: #774730
* Drop left-over translation files for removed lb_testroot command. * Drop left-over translation files for removed lb_testroot command.
* Get rid of useless bootstrap_archive-keys script. Closes: #773775 * 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 ] [ Kristian Klausen ]
* Include ext{3,4} journal size when calculating image size. Closes: #801712 * Include ext{3,4} journal size when calculating image size. Closes: #801712

11
scripts/build/chroot_archives
View File

@ -456,17 +456,6 @@ then
fi fi
# Configure generic indices # 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 # Cleaning apt list cache
rm -rf chroot/var/lib/apt/lists rm -rf chroot/var/lib/apt/lists
mkdir -p chroot/var/lib/apt/lists/partial mkdir -p chroot/var/lib/apt/lists/partial