* Add default_mirror function; reorganise the debootstrap script a little

  so that it works. Set the default mirror for Ubuntu suites to
  http://archive.ubuntu.com/ubuntu, and the default mirror for Debian
  etch/lenny/sid architectures other than amd64 and i386 to
  http://ftp.us.debian.org/debian (per ajt).

r47570

13 files changed, 20 insertions, 0 deletions

diff --git a/scripts/debian/sid b/scripts/debian/sid
index 76cca38..480a74d 100644
--- a/scripts/debian/sid
+++ b/scripts/debian/sid
@@ -1,3 +1,11 @@
+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
diff --git a/scripts/ubuntu/breezy b/scripts/ubuntu/breezy
index d0955da..9899a85 100644
--- a/scripts/ubuntu/breezy
+++ b/scripts/ubuntu/breezy
@@ -1,3 +1,4 @@
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/scripts/ubuntu/dapper b/scripts/ubuntu/dapper
index 75ea7f6..de091b5 100644
--- a/scripts/ubuntu/dapper
+++ b/scripts/ubuntu/dapper
@@ -1,3 +1,4 @@
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/scripts/ubuntu/edgy b/scripts/ubuntu/edgy
index eb5efa1..4c421fc 100644
--- a/scripts/ubuntu/edgy
+++ b/scripts/ubuntu/edgy
@@ -1,3 +1,4 @@
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/scripts/ubuntu/edgy.fakechroot b/scripts/ubuntu/edgy.fakechroot
index 0dea4af..dc3e0d3 100644
--- a/scripts/ubuntu/edgy.fakechroot
+++ b/scripts/ubuntu/edgy.fakechroot
@@ -1,5 +1,6 @@
 test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
 
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/scripts/ubuntu/feisty b/scripts/ubuntu/feisty
index eb5efa1..4c421fc 100644
--- a/scripts/ubuntu/feisty
+++ b/scripts/ubuntu/feisty
@@ -1,3 +1,4 @@
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/scripts/ubuntu/feisty.fakechroot b/scripts/ubuntu/feisty.fakechroot
index 932cfa7..d6f8410 100644
--- a/scripts/ubuntu/feisty.fakechroot
+++ b/scripts/ubuntu/feisty.fakechroot
@@ -1,5 +1,6 @@
 test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
 
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/scripts/ubuntu/gutsy b/scripts/ubuntu/gutsy
index 8177272..84a3450 100644
--- a/scripts/ubuntu/gutsy
+++ b/scripts/ubuntu/gutsy
@@ -1,3 +1,4 @@
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/scripts/ubuntu/gutsy.fakechroot b/scripts/ubuntu/gutsy.fakechroot
index 826ff69..4ead32c 100644
--- a/scripts/ubuntu/gutsy.fakechroot
+++ b/scripts/ubuntu/gutsy.fakechroot
@@ -1,5 +1,6 @@
 test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
 
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/scripts/ubuntu/hoary b/scripts/ubuntu/hoary
index e6207d5..51976f7 100644
--- a/scripts/ubuntu/hoary
+++ b/scripts/ubuntu/hoary
@@ -1,3 +1,4 @@
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 
diff --git a/scripts/ubuntu/hoary.buildd b/scripts/ubuntu/hoary.buildd
index 90937b6..a70f98d 100644
--- a/scripts/ubuntu/hoary.buildd
+++ b/scripts/ubuntu/hoary.buildd
@@ -1,3 +1,4 @@
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 
diff --git a/scripts/ubuntu/warty b/scripts/ubuntu/warty
index 6842589..f3c4ef6 100644
--- a/scripts/ubuntu/warty
+++ b/scripts/ubuntu/warty
@@ -1,3 +1,4 @@
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt
 
diff --git a/scripts/ubuntu/warty.buildd b/scripts/ubuntu/warty.buildd
index 9019d8d..9edb63c 100644
--- a/scripts/ubuntu/warty.buildd
+++ b/scripts/ubuntu/warty.buildd
@@ -1,3 +1,4 @@
+default_mirror http://archive.ubuntu.com/ubuntu
 mirror_style release
 download_style apt