switch to http.debian.net mirror; set distro name

2 files changed, 23 insertions, 16 deletions

diff --git a/auto/config b/auto/config
index 0e77078..95e08eb 100755
--- a/auto/config
+++ b/auto/config
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 lb config noauto \
+    --distribution "torouter" \
     --architectures armel \
     --linux-flavours kirkwood \
     --apt-secure true \
@@ -8,6 +9,8 @@ lb config noauto \
     --cache true \
     --cache-indices true \
     --cache-packages true \
+    --parent-mirror-bootstrap http://http.debian.net/debian \
+    --mirror-bootstrap http://http.debian.net/debian \
     --cache-stages rootfs \
     --distribution wheezy \
     --parent-distribution wheezy \
@@ -20,3 +23,7 @@ lb config noauto \
     --keyring-packages "debian-archive-keyring deb.torproject.org-keyring" \
     --bootappend-live "boot=live config username=torouter" \
     "${@}"
+
+# Note: chroot filesystem should be 'squashfs' for final images, 'none' for
+# development
+# Note: bootappend-live options are ignored when booting from u-boot
diff --git a/config/bootstrap b/config/bootstrap
index 804f4fb..b575c6f 100644
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -17,20 +17,20 @@ LB_PARENT_DISTRIBUTION="wheezy"
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="wheezy"
 
 # $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
-# (Default: http://ftp.debian.org/debian/)
-LB_PARENT_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
+# (Default: http://http.debian.net/debian)
+LB_PARENT_MIRROR_BOOTSTRAP="http://http.debian.net/debian"
 
 # $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
-# (Default: http://ftp.debian.org/debian/)
-LB_PARENT_MIRROR_CHROOT="http://ftp.debian.org/debian/"
+# (Default: http://http.debian.net/debian)
+LB_PARENT_MIRROR_CHROOT="http://http.debian.net/debian"
 
 # $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
 # (Default: http://security.debian.org/)
 LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_PARENT_MIRROR_CHROOT_UPDATES: set updates parent mirror to fetch packages from
-# (Default: http://ftp.debian.org/debian/)
-LB_PARENT_MIRROR_CHROOT_UPDATES="http://ftp.debian.org/debian/"
+# (Default: http://http.debian.net/debian)
+LB_PARENT_MIRROR_CHROOT_UPDATES="http://http.debian.net/debian"
 
 # $LB_PARENT_MIRROR_CHROOT_BACKPORTS: set backports parent mirror to fetch packages from
 # (Default: http://backports.debian.org/debian-backports/)
@@ -53,24 +53,24 @@ LB_PARENT_MIRROR_BINARY_UPDATES="http://http.debian.net/debian/"
 LB_PARENT_MIRROR_BINARY_BACKPORTS="http://http.debian.net/debian-backports/"
 
 # $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
-# (Default: http://ftp.debian.org/debian/)
-LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://ftp.debian.org/debian/"
+# (Default: http://http.debian.net/debian)
+LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://http.debian.net/debian"
 
 # $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: http://ftp.debian.org/debian/)
-LB_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
+# (Default: http://http.debian.net/debian)
+LB_MIRROR_BOOTSTRAP="http://http.debian.net/debian"
 
 # $LB_MIRROR_CHROOT: set mirror to fetch packages from
-# (Default: http://ftp.debian.org/debian/)
-LB_MIRROR_CHROOT="http://ftp.debian.org/debian/"
+# (Default: http://http.debian.net/debian)
+LB_MIRROR_CHROOT="http://http.debian.net/debian"
 
 # $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
 # (Default: http://security.debian.org/)
 LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_MIRROR_CHROOT_UPDATES: set updates mirror to fetch packages from
-# (Default: http://ftp.debian.org/debian/)
-LB_MIRROR_CHROOT_UPDATES="http://ftp.debian.org/debian/"
+# (Default: http://http.debian.net/debian)
+LB_MIRROR_CHROOT_UPDATES="http://http.debian.net/debian"
 
 # $LB_MIRROR_CHROOT_BACKPORTS: set backports mirror to fetch packages from
 # (Default: http://backports.debian.org/debian-backports/)
@@ -93,8 +93,8 @@ LB_MIRROR_BINARY_UPDATES="http://http.debian.net/debian/"
 LB_MIRROR_BINARY_BACKPORTS="http://http.debian.net/debian-backports/"
 
 # $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
-# (Default: http://ftp.debian.org/debian/)
-LB_MIRROR_DEBIAN_INSTALLER="http://ftp.debian.org/debian/"
+# (Default: http://http.debian.net/debian)
+LB_MIRROR_DEBIAN_INSTALLER="http://http.debian.net/debian"
 
 # $LB_ARCHIVES: enable available third-party archives
 # (Default: empty)