Commit 230dd6ca authored by Joey Hess's avatar Joey Hess

Avoid writing https urls into sources.list, as apt does not support https.

When a https url is used, fall back to the default mirror for sources.list.
parent e6380aad
......@@ -12,6 +12,7 @@ debootstrap (1.0.56) UNRELEASED; urgency=low
least the CA level of security is available even for users who
have no way to check gpg keys in the WoT. The https mirror is
currently https://mirrors.kernel.org/debian.
* Avoid writing https urls into sources.list, as apt does not support https.
-- Tollef Fog Heen <tfheen@debian.org> Thu, 19 Dec 2013 13:41:37 +0100
......
......@@ -652,7 +652,7 @@ if am_doing_phase second_stage; then
if [ -e "$TARGET/etc/apt/sources.list" ]; then
rm -f "$TARGET/etc/apt/sources.list"
fi
if [ "${MIRRORS#http*://}" != "$MIRRORS" ]; then
if [ "${MIRRORS#http://}" != "$MIRRORS" ]; then
setup_apt_sources "${MIRRORS%% *}"
mv_invalid_to "${MIRRORS%% *}"
else
......
......@@ -22,7 +22,7 @@ from
by running
.IR SCRIPT .
.I MIRROR
can be an http:// URL, a file:/// URL, or an ssh:/// URL.
can be an http:// or https:// URL, a file:/// URL, or an ssh:/// URL.
.PP
The
.I SUITE
......
......@@ -202,7 +202,7 @@ keyring () {
elif [ -z "$DISABLE_KEYRING" ]; then
if [ -n "$DEF_HTTPS_MIRROR" ] && [ -z "$USER_MIRROR" ] ; then
info KEYRING "Keyring file not available at %s; switching to https mirror %s" "$1" "$DEF_HTTPS_MIRROR"
DEF_MIRROR="$DEF_HTTPS_MIRROR"
USER_MIRROR="$DEF_HTTPS_MIRROR"
else
warning KEYRING "Cannot check Release signature; keyring file not available %s" "$1"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment