[Fai-commit] r6038 - in branches/stable/3.4: conf examples/simple/files/etc/fai/apt/sources.list examples/simple/files/etc/fai/make-fai-nfsroot.conf examples/simple/scripts/FAISERVER utils

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:58:25 +0000 (Tue, 17 Aug 2010)
New Revision: 6038

Modified:
   branches/stable/3.4/conf/make-fai-nfsroot.conf
   branches/stable/3.4/conf/sources.list
   branches/stable/3.4/examples/simple/files/etc/fai/apt/sources.list/FAISERVER
   branches/stable/3.4/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
   branches/stable/3.4/examples/simple/scripts/FAISERVER/20-copy-mirror
   branches/stable/3.4/utils/mkdebmirror
Log:
Replace lenny with squeeze in all apt related sources.

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/conf/make-fai-nfsroot.conf
===================================================================
--- branches/stable/3.4/conf/make-fai-nfsroot.conf	2010-08-17 12:58:21 UTC (rev 6037)
+++ branches/stable/3.4/conf/make-fai-nfsroot.conf	2010-08-17 12:58:25 UTC (rev 6038)
@@ -16,7 +16,7 @@
 #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"
 
 # Parameter for debootstrap: "<suite> <mirror>"
-FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian"
+FAI_DEBOOTSTRAP="squeeze 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: branches/stable/3.4/conf/sources.list
===================================================================
--- branches/stable/3.4/conf/sources.list	2010-08-17 12:58:21 UTC (rev 6037)
+++ branches/stable/3.4/conf/sources.list	2010-08-17 12:58:25 UTC (rev 6038)
@@ -1,8 +1,8 @@
 # These lines should work for many sites
 # A more comprehensive example is at /usr/share/doc/fai-doc/examples/etc
 
-deb http://cdn.debian.net/debian lenny main contrib non-free
-deb http://security.debian.org/debian-security lenny/updates main contrib non-free
+deb http://cdn.debian.net/debian squeeze main contrib non-free
+deb http://security.debian.org/debian-security squeeze/updates main contrib non-free
 
 # repository that may contain newer fai packages for lenny
 #deb http://www.informatik.uni-koeln.de/fai/download lenny koeln

Modified: branches/stable/3.4/examples/simple/files/etc/fai/apt/sources.list/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/files/etc/fai/apt/sources.list/FAISERVER	2010-08-17 12:58:21 UTC (rev 6037)
+++ branches/stable/3.4/examples/simple/files/etc/fai/apt/sources.list/FAISERVER	2010-08-17 12:58:25 UTC (rev 6038)
@@ -1,8 +1,8 @@
 # via local partial mirror (was mirror on fai-cd)
-deb http://faiserver/debian lenny main 
-#deb http://faiserver/debian lenny/updates main
-#deb http://faiserver/debian-security lenny/updates main contrib non-free
+deb http://faiserver/debian squeeze main
+#deb http://faiserver/debian squeeze/updates main
+#deb http://faiserver/debian-security squeeze/updates main contrib non-free
 
 # via apt-proxy
-deb http://faiserver:9999/debian lenny main contrib non-free
-deb http://faiserver:9999/security lenny/updates main contrib non-free
+deb http://faiserver:9999/debian squeeze main contrib non-free
+deb http://faiserver:9999/security squeeze/updates main contrib non-free

Modified: branches/stable/3.4/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER	2010-08-17 12:58:21 UTC (rev 6037)
+++ branches/stable/3.4/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER	2010-08-17 12:58:25 UTC (rev 6038)
@@ -16,7 +16,7 @@
 NFSROOT_ETC_HOSTS="192.168.1.250 faiserver"
 
 # Parameter for debootstrap: "<suite> <mirror>"
-FAI_DEBOOTSTRAP="lenny http://faiserver/debian"
+FAI_DEBOOTSTRAP="squeeze http://faiserver/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: branches/stable/3.4/examples/simple/scripts/FAISERVER/20-copy-mirror
===================================================================
--- branches/stable/3.4/examples/simple/scripts/FAISERVER/20-copy-mirror	2010-08-17 12:58:21 UTC (rev 6037)
+++ branches/stable/3.4/examples/simple/scripts/FAISERVER/20-copy-mirror	2010-08-17 12:58:25 UTC (rev 6038)
@@ -9,7 +9,7 @@
 cp -a /media/mirror/* $target/var/www/debian
 
 cd $target/var/www/debian/dists
-# this link can only work when lenny is released. For testing before the release use : ln -s testing lenny
-ln -s stable lenny
+# this link can only work when squeeze is released. For testing before the release use : ln -s testing squeeze
+ln -s stable squeeze
 
 fcopy -v /etc/rc2.d/S99fai-setup

Modified: branches/stable/3.4/utils/mkdebmirror
===================================================================
--- branches/stable/3.4/utils/mkdebmirror	2010-08-17 12:58:21 UTC (rev 6037)
+++ branches/stable/3.4/utils/mkdebmirror	2010-08-17 12:58:25 UTC (rev 6038)
@@ -24,7 +24,7 @@
 
 debug="$@"
 arch=i386
-dist=lenny
+dist=squeeze
 
 destdir=/files/scratch/debmirror
 sect="--section main,contrib,non-free"
@@ -38,4 +38,4 @@
 
 # even one should not mirror the security site, but I will do it.
 echo "------------------ create mirror for debian-security ------------------"
-debmirror $destdir/debian-security $allopt --host=security.debian.org -r debian-security $sect -d lenny/updates
+debmirror $destdir/debian-security $allopt --host=security.debian.org -r debian-security $sect -d squeeze/updates