From 58bbe26622be988a1b2e4575fbb206ed92fb9efb Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Oct 2007 21:47:35 +0200 Subject: Adding support for a local /etc/apt/preferences file in config/chroot_apt/preferences. --- helpers/lh_chroot_apt | 19 +++++++++++++++++++ helpers/lh_config | 1 + 2 files changed, 20 insertions(+) diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index 5ba5b00..ffba6d7 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -106,6 +106,17 @@ case "${1}" in ;; esac + # Configuring apt preferences + if [ -f config/chroot_apt/preferences ] + then + if [ -f chroot/etc/apt/preferences ] + then + mv chroot/etc/apt/preferences chroot/etc/apt/prefereces.orig + fi + + cp config/chroot_apt/preferences chroot/etc/apt/preferences + fi + # Creating stage file Create_stagefile .stage/chroot_apt ;; @@ -137,6 +148,14 @@ case "${1}" in # Deconfiguring aptitude secure rm -f chroot/etc/apt/apt.conf.d/00secure + # Deconfiguring apt preferences + if [ -f config/chroot_apt/preferences.orig ] + then + mv chroot/etc/apt/preferences.orig chroot/etc/apt/preferences + else + rm -f chroot/etc/apt/preferences + fi + # Removing stage file rm -f .stage/chroot_apt ;; diff --git a/helpers/lh_config b/helpers/lh_config index 3ffb6f4..7c20e1b 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -764,6 +764,7 @@ LH_SECTIONS="${LH_SECTIONS}" EOF # Creating lh_chroot_* configuration +mkdir -p config/chroot_apt mkdir -p config/chroot_local-hooks mkdir -p config/chroot_local-includes mkdir -p config/chroot_local-packages -- cgit v1.0