From b070f0a9a32e12bdd7727424868d6330ea4a0d2c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 16 Aug 2008 03:15:40 +0200 Subject: Preserve changed apt settings (pdiffs, recommends, and secure) in binary image (Closes: #494640). --- helpers/lh_chroot_apt | 15 ++++++++++++--- 1 file 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 ] -- cgit v1.0