summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-13 13:41:54 (GMT)
committerColin Watson <cjwatson@debian.org>2014-02-13 13:41:54 (GMT)
commit08cfced48bdf7bc1240efb63f69cde7ed385038b (patch)
treec9d771db1685533d018eb664d20058f528aa0c9e
parent4766802e55bf4eab31a4a71f992142cec4eab413 (diff)
downloaddebootstrap-08cfced48bdf7bc1240efb63f69cde7ed385038b.zip
debootstrap-08cfced48bdf7bc1240efb63f69cde7ed385038b.tar.gz
debootstrap-08cfced48bdf7bc1240efb63f69cde7ed385038b.tar.bz2
Install ca-certificates as well as apt-transport-https for HTTPS installations. This makes it possible to copy certificates that were built into the installer to /usr/local/share/ca-certificates/ and thus have them continue to be trusted after installation.
-rw-r--r--debian/changelog9
-rw-r--r--scripts/gutsy2
-rw-r--r--scripts/sid2
3 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 5189d3e..51aad02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debootstrap (1.0.59) UNRELEASED; urgency=medium
+
+ * Install ca-certificates as well as apt-transport-https for HTTPS
+ installations. This makes it possible to copy certificates that were
+ built into the installer to /usr/local/share/ca-certificates/ and thus
+ have them continue to be trusted after installation.
+
+ -- Colin Watson <cjwatson@debian.org> Wed, 12 Feb 2014 17:25:37 +0000
+
debootstrap (1.0.58) unstable; urgency=medium
* Policy version 3.9.5: no changes required.
diff --git a/scripts/gutsy b/scripts/gutsy
index 69513f4..bb39bf5 100644
--- a/scripts/gutsy
+++ b/scripts/gutsy
@@ -46,7 +46,7 @@ work_out_debs () {
case $MIRRORS in
https://*)
- base="$base apt-transport-https"
+ base="$base apt-transport-https ca-certificates"
;;
esac
}
diff --git a/scripts/sid b/scripts/sid
index 241f867..bf3404f 100644
--- a/scripts/sid
+++ b/scripts/sid
@@ -35,7 +35,7 @@ work_out_debs () {
case $MIRRORS in
https://*)
- base="$base apt-transport-https"
+ base="$base apt-transport-https ca-certificates"
;;
esac
}