diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | debootstrap | 2 | ||||
| -rw-r--r-- | debootstrap.8 | 4 | ||||
| -rw-r--r-- | scripts/debian/sid | 8 |
5 files changed, 6 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 071cbfd..442eb0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ debootstrap (1.0.8) UNRELEASED; urgency=low use the "upstream" Makefile on non-Debian systems. Create necessary directories in the Makefile rather than relying on dh_installdirs to do it (LP: #172645). + * Use ftp.us.debian.org rather than ftp.debian.org + (http://lists.debian.org/debian-devel-announce/2007/12/msg00002.html). [ Anthony Towns ] * Add minbase variant for the sid script that only install apt (and diff --git a/debian/rules b/debian/rules index 42df8ce..f2965d3 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ binary-indep: install ARCHES="i386" SUITE="testing" VERSION=$(SUITE) -MIRROR="http://ftp.debian.org/debian" +MIRROR="http://ftp.us.debian.org/debian" binary-basedebs: dh_testdir diff --git a/debootstrap b/debootstrap index c4b2b9d..7ea65e5 100755 --- a/debootstrap +++ b/debootstrap @@ -29,7 +29,7 @@ USE_COMPONENTS=main KEYRING="" VARIANT="" -DEF_MIRROR="http://ftp.debian.org/debian" +DEF_MIRROR="http://ftp.us.debian.org/debian" export LANG USE_COMPONENTS umask 022 diff --git a/debootstrap.8 b/debootstrap.8 index 3da899a..3d3aead 100644 --- a/debootstrap.8 +++ b/debootstrap.8 @@ -126,14 +126,14 @@ Used for internal purposes by the debian-installer .PP To setup a \fIsarge\fR system: .PP -# debootstrap sarge ./sarge-chroot http://ftp.debian.org/debian +# debootstrap sarge ./sarge-chroot http://ftp.us.debian.org/debian .PP # debootstrap sarge ./sarge-chroot file:///PATH_TO_LOCAL_MIRROR/debian .PP Full process to create a complete Debian installation of \fIsid\fR (unstable): .PP main # cd / ; mkdir /sid-root - main # debootstrap sid /sid-root http://ftp.debian.org/debian/ + main # debootstrap sid /sid-root http://ftp.us.debian.org/debian/ [ ... watch it download the whole system ] main # echo "proc /sid-root/proc proc none 0 0" >> /etc/fstab main # mount proc /sid-root/proc -t proc diff --git a/scripts/debian/sid b/scripts/debian/sid index d301f98..584ee41 100644 --- a/scripts/debian/sid +++ b/scripts/debian/sid @@ -1,11 +1,3 @@ -case $ARCH in - amd64|i386) - ;; - *) - # ftp.debian.org only has amd64 and i386 - default_mirror http://ftp.us.debian.org/debian - ;; -esac mirror_style release download_style apt finddebs_style from-indices |