summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2016-10-19 05:36:00 (GMT)
committerJulien Cristau <jcristau@debian.org>2016-10-19 05:36:00 (GMT)
commit90bfdbd4ecd7822ea313afafa198c827ce0e1bda (patch)
treec70d07e4155da3017b0bddc858404d1fabc20d33
parent6b98ab963dba863c76a3923609602851bde6b402 (diff)
downloaddebootstrap-90bfdbd4ecd7822ea313afafa198c827ce0e1bda.zip
debootstrap-90bfdbd4ecd7822ea313afafa198c827ce0e1bda.tar.gz
debootstrap-90bfdbd4ecd7822ea313afafa198c827ce0e1bda.tar.bz2
Revert "Switch default mirror to deb.debian.org."
Pushed by mistake. This reverts commit fc9b919df580daf1183649bf197cb2c06a41e95b.
-rw-r--r--README2
-rw-r--r--debian/changelog1
-rwxr-xr-xdebootstrap4
-rw-r--r--debootstrap.84
4 files changed, 5 insertions, 6 deletions
diff --git a/README b/README
index 4e1e859..47fdec6 100644
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ If you are running a multi-stage boot strap (for example for a QEMU
rootfs) you don't even need root:
export DEBOOTSTRAP_DIR=`pwd`
- fakeroot ./debootstrap --foreign --arch=armhf testing my-testing-dir http://deb.debian.org/debian
+ fakeroot ./debootstrap --foreign --arch=armhf testing my-testing-dir http://httpredir.debian.org/debian
Of course you will need to execute the second stage as root to finish the bootstrap:
diff --git a/debian/changelog b/debian/changelog
index 137082c..56a85d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ debootstrap (1.0.85) UNRELEASED; urgency=medium
* Add support for downloading and validating InRelease files, by splitting
up detached signature from signed data.
- * Switch default mirror to deb.debian.org.
-- Julien Cristau <jcristau@debian.org> Fri, 02 Sep 2016 20:26:38 +0200
diff --git a/debootstrap b/debootstrap
index 627e591..084a541 100755
--- a/debootstrap
+++ b/debootstrap
@@ -46,8 +46,8 @@ CERTIFICATE=""
CHECKCERTIF=""
PRIVATEKEY=""
-DEF_MIRROR="http://deb.debian.org/debian"
-DEF_HTTPS_MIRROR="https://deb.debian.org/debian"
+DEF_MIRROR="http://httpredir.debian.org/debian"
+DEF_HTTPS_MIRROR="https://mirrors.kernel.org/debian"
export LANG USE_COMPONENTS
umask 022
diff --git a/debootstrap.8 b/debootstrap.8
index 3b4369e..3d19683 100644
--- a/debootstrap.8
+++ b/debootstrap.8
@@ -165,14 +165,14 @@ Read the private key from file
.PP
To setup a \fIwheezy\fR system:
.PP
- debootstrap wheezy ./wheezy-chroot http://deb.debian.org/debian
+ debootstrap wheezy ./wheezy-chroot http://httpredir.debian.org/debian
.PP
debootstrap wheezy ./wheezy-chroot file:///LOCAL_MIRROR/debian
.PP
Full process to create a complete Debian installation of \fIsid\fR (unstable)
in a chroot:
.PP
- main # debootstrap sid sid-root http://deb.debian.org/debian/
+ main # debootstrap sid sid-root http://httpredir.debian.org/debian/
[ ... watch it download the whole system ]
main # echo "proc sid-root/proc proc defaults 0 0" >> /etc/fstab
main # mount proc sid-root/proc -t proc