diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/chroot_archives | 22 |
1 files 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 |