summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-10-12 11:04:10 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:20:34 +0100
commitd2d691a5ed0005547094e462b96b76c7488c0ddb (patch)
tree661318469ce0776547cbd79e8503dfcb0cc5dc9b
parent4ea5bdde98dd8d9bd26c2f0eb8ededcf0ec813ff (diff)
downloadvyos-live-build-d2d691a5ed0005547094e462b96b76c7488c0ddb.tar.gz
vyos-live-build-d2d691a5ed0005547094e462b96b76c7488c0ddb.zip
Updating special handling for backports.
-rwxr-xr-xscripts/build/lb_config12
1 files changed, 4 insertions, 8 deletions
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 3d0583ea5..9a2f82bd6 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1331,27 +1331,23 @@ then
cat > config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot << EOF
# Backports Maintainers
-deb http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free
-deb-src http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free
+deb http://backports.debian.org/debian-backports/ ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}
+deb-src http://backports.debian.org/debian-backports/ ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}
EOF
cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot config/chroot_sources/${LB_DISTRIBUTION}-backports.binary
# Adding apt preferences
- if ! grep -qs "^Pin: release o=backports.debian-maintainers.org" config/chroot_apt/preferences
+ if ! grep -qs "^Pin: release o=Debian Backports" config/chroot_apt/preferences
then
cat >> config/chroot_apt/preferences << EOF
Package: *
-Pin: release o=backports.debian-maintainers.org
+Pin: release o=Debian Backports
Pin-Priority: 999
EOF
fi
-
- # Addding archive signing key
- wget -q http://backports.debian-maintainers.org/project/openpgp/archive-key.asc -O config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg
- cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg config/chroot_sources/${LB_DISTRIBUTION}-backports.binary.gpg
fi
# Checking defaults again