diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-08-16 03:15:40 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:40 +0100 |
| commit | b070f0a9a32e12bdd7727424868d6330ea4a0d2c (patch) | |
| tree | a971ea05c70f8974fe0bb58e8bb569a0ee762481 | |
| parent | 026a683b771ef549337777a28b636555dabd260b (diff) | |
| download | live-build-b070f0a9a32e12bdd7727424868d6330ea4a0d2c.zip live-build-b070f0a9a32e12bdd7727424868d6330ea4a0d2c.tar.gz | |
Preserve changed apt settings (pdiffs, recommends, and secure) in binary image (Closes: #494640).
| -rwxr-xr-x | helpers/lh_chroot_apt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index a7a12d8..111adb9 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -162,16 +162,25 @@ case "${1}" in rm -f chroot/etc/apt/apt.conf.d/00http-proxy # Deconfiguring aptitude pdiffs - rm -f chroot/etc/apt/apt.conf.d/00pdiffs + if [ "${LH_APT_PDIFFS}" = "enabled" ] + then + rm -f chroot/etc/apt/apt.conf.d/00pdiffs + fi # Deconfiguring aptitude pipeline rm -f chroot/etc/apt/apt.conf.d/00pipeline # Deconfiguring aptitude recommends - rm -f chroot/etc/apt/apt.conf.d/00recommends + if [ "${LH_APT_RECOMMENDS}" = "enabled" ] + then + rm -f chroot/etc/apt/apt.conf.d/00recommends + fi # Deconfiguring aptitude secure - rm -f chroot/etc/apt/apt.conf.d/00secure + if [ "${LH_APT_SECURE}" = "enabled" ] + then + rm -f chroot/etc/apt/apt.conf.d/00secure + fi # Deconfiguring apt preferences if [ -f chroot/etc/apt/preferences.orig ] |