summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-05-20 09:29:59 +0100
committerColin Watson <cjwatson@debian.org>2011-05-20 09:29:59 +0100
commit4bab1a20741b9864445d3f5c0203697ed52ea224 (patch)
tree3f588f2f09d88ca462b84dd782e714222ddf0a3f
parent9cc47c88a2ea16f75a05709f213bf14c48603a19 (diff)
downloaddebootstrap-4bab1a20741b9864445d3f5c0203697ed52ea224.tar.gz
If ubuntu-keyring is installed, check Release signatures against it when bootstrapping Ubuntu gutsy and later.
-rw-r--r--debian/changelog7
-rw-r--r--scripts/gutsy1
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1ed60a5..62f2f86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debootstrap (1.0.31) UNRELEASED; urgency=low
+
+ * If ubuntu-keyring is installed, check Release signatures against it when
+ bootstrapping Ubuntu gutsy and later.
+
+ -- Colin Watson <cjwatson@debian.org> Fri, 20 May 2011 09:26:48 +0100
+
debootstrap (1.0.30) unstable; urgency=low
[ Mark Hymers ]
diff --git a/scripts/gutsy b/scripts/gutsy
index 24c6a3f..705cac5 100644
--- a/scripts/gutsy
+++ b/scripts/gutsy
@@ -20,6 +20,7 @@ mirror_style release
download_style apt
finddebs_style from-indices
variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
if doing_variant fakechroot; then
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"