From c83edb91347b50275893b71ec307b8f69dc8e3db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 9 Jan 2009 16:17:31 +0100 Subject: Also handling custom apt.conf in config/chroot_apt/apt.conf to allow further apt configuration (Closes: #511247). --- helpers/lh_chroot_apt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index b82e3ee..f7adb07 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -101,6 +101,17 @@ case "${1}" in ;; esac + # Configuring apt config + if [ -f config/chroot_apt/apt.conf ] + then + if [ -f chroot/etc/apt/apt.conf ] + then + mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig + fi + + cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf + fi + # Configuring apt preferences if [ -f config/chroot_apt/preferences ] then @@ -182,6 +193,17 @@ case "${1}" in rm -f chroot/etc/apt/apt.conf.d/00secure fi + # Configuring apt config + if [ -f config/chroot_apt/apt.conf ] + then + if [ -f chroot/etc/apt/apt.conf ] + then + mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig + fi + + cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf + fi + # Deconfiguring apt preferences if [ -f chroot/etc/apt/preferences.orig ] then -- cgit v1.0