From ddb8ad5daee4f33bb07e7f7d54232890d776d304 Mon Sep 17 00:00:00 2001
From: Jan Blunck <jblunck@vyatta.com>
Date: Wed, 18 Sep 2013 10:48:21 +0200
Subject: Selectively remove chroot-only APT configuration and preferences
 instead of wiping everything.

---
 scripts/build/chroot_archives | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 226bad652..d45aa527e 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -673,10 +673,6 @@ EOF
 			fi
 		fi
 
-		# probably too bold, needs refinment (FIXME)
-		rm -f chroot/etc/apt/conf.d/*
-		rm -f chroot/etc/apt/preferences.d/*
-
 		# Removing chroot-only apt sources
 		for FILE in config/archives/*.list.chroot
 		do
@@ -686,6 +682,24 @@ EOF
 			fi
 		done
 
+		# Removing chroot-only apt configuration
+		for FILE in config/archives/*.conf.chroot
+		do
+			if [ -e "${FILE}" ]
+			then
+				rm -f "chroot/etc/apt/conf.d/$(basename ${FILE} .chroot)"
+			fi
+		done
+
+		# Removing chroot-only apt preferences
+		for FILE in config/archives/*.pref.chroot
+		do
+			if [ -e "${FILE}" ]
+			then
+				rm -f "chroot/etc/apt/preferences.d/$(basename ${FILE} .chroot)"
+			fi
+		done
+
 		# Adding local apt sources (binary)
 		for FILE in config/archives/*.list config/archives/*.list.binary
 		do
-- 
cgit v1.2.3