diff options
| author | Jan Blunck <jblunck@vyatta.com> | 2013-09-17 13:28:00 +0200 |
|---|---|---|
| committer | Jan Blunck <jblunck@vyatta.com> | 2013-09-18 10:36:31 +0200 |
| commit | 4d9c77d20e517c5dc195183978a2c91d9ba577de (patch) | |
| tree | 279029a4ba64cd1dcce7525e731f729012e421ea /scripts | |
| parent | 3b332c3788eab3f86d17457e832b73e21dc24ec1 (diff) | |
| download | vyos-live-build-4d9c77d20e517c5dc195183978a2c91d9ba577de.tar.gz vyos-live-build-4d9c77d20e517c5dc195183978a2c91d9ba577de.zip | |
Remove chroot-only configured apt sources in chroot_archives remove.
If an archive is configured with *.chroot extension remove it when
deconfiguring chroot/etc/apt/sources.list.d directory.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/chroot_archives | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 95b47c38b..226bad652 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -677,6 +677,15 @@ EOF 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 + if [ -e "${FILE}" ] + then + rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" + fi + done + # Adding local apt sources (binary) for FILE in config/archives/*.list config/archives/*.list.binary do |