[Fai-commit] r5633 - in trunk: conf debian

[Thomas Lange]

Author: lange
Date: 2009-11-01 14:44:08 +0000 (Sun, 01 Nov 2009)
New Revision: 5633

Modified:
   trunk/conf/make-fai-nfsroot.conf
   trunk/conf/sources.list
   trunk/debian/changelog
Log:
sources.list,make-fai-nfsroot.conf: use Debian geo mirrors

Modified: trunk/conf/make-fai-nfsroot.conf
===================================================================
--- trunk/conf/make-fai-nfsroot.conf	2009-10-31 15:48:55 UTC (rev 5632)
+++ trunk/conf/make-fai-nfsroot.conf	2009-11-01 14:44:08 UTC (rev 5633)
@@ -16,7 +16,7 @@
 #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"
 
 # Parameter for debootstrap: "<suite> <mirror>"
-FAI_DEBOOTSTRAP="lenny http://ftp.debian.org/debian"
+FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian"
 
 # the encrypted (with md5 or crypt) root password on all install clients during
 # installation process; used when log in via ssh; default pw is: fai

Modified: trunk/conf/sources.list
===================================================================
--- trunk/conf/sources.list	2009-10-31 15:48:55 UTC (rev 5632)
+++ trunk/conf/sources.list	2009-11-01 14:44:08 UTC (rev 5633)
@@ -1,10 +1,8 @@
 # These lines should work for many sites
 # A more comprehensive example is at /usr/share/doc/fai-doc/examples/etc
 
-deb http://ftp.debian.org/debian lenny main contrib non-free
-#deb http://ftp.debian.org/debian lenny-proposed-updates main contrib non-free
+deb http://cdn.debian.net/debian lenny main contrib non-free
+deb http://security.geo.debian.org/debian-security lenny/updates main contrib non-free
 
-# repository that may contains newer fai packages for lenny
+# repository that may contain newer fai packages for lenny
 #deb http://www.informatik.uni-koeln.de/fai/download lenny koeln
-
-deb http://security.debian.org/debian-security lenny/updates main contrib non-free

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-31 15:48:55 UTC (rev 5632)
+++ trunk/debian/changelog	2009-11-01 14:44:08 UTC (rev 5633)
@@ -3,6 +3,7 @@
   [ Thomas Lange ]
   * NEWS: add hint about missing packages in nfsroot, changes in
     dirinstall
+  * sources.list,make-fai-nfsroot.conf: use Debian geo mirrors
   * subroutines-linux: fix log message
     remove yes pipe when calling debootstrap (closes: #539980)
     if NEXTTEST is used, define a class for next reboot. Thanks to