[Fai-commit] r6472 - in trunk: conf examples/simple/files/etc/fai/make-fai-nfsroot.conf examples/simple/scripts/FAISERVER utils

[Michael Tautschnig]

Author: mt
Date: 2011-04-16 09:38:07 +0000 (Sat, 16 Apr 2011)
New Revision: 6472

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

Merge of 7cd0760 from 3.4 into trunk.


Modified: trunk/conf/make-fai-nfsroot.conf
===================================================================
--- trunk/conf/make-fai-nfsroot.conf	2011-04-16 09:37:28 UTC (rev 6471)
+++ trunk/conf/make-fai-nfsroot.conf	2011-04-16 09:38:07 UTC (rev 6472)
@@ -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: trunk/conf/sources.list
===================================================================
--- trunk/conf/sources.list	2011-04-16 09:37:28 UTC (rev 6471)
+++ trunk/conf/sources.list	2011-04-16 09:38:07 UTC (rev 6472)
@@ -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 squeeze
 #deb http://fai-project.org/download squeeze koeln

Modified: trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER	2011-04-16 09:37:28 UTC (rev 6471)
+++ trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER	2011-04-16 09:38:07 UTC (rev 6472)
@@ -16,7 +16,7 @@
 NFSROOT_ETC_HOSTS="192.168.33.250 faiserver"
 
 # Parameter for debootstrap: "<suite> <mirror>"
-FAI_DEBOOTSTRAP="lenny http://faiserver:9999/debian"
+FAI_DEBOOTSTRAP="squeeze http://faiserver:9999/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/examples/simple/scripts/FAISERVER/20-copy-mirror
===================================================================
--- trunk/examples/simple/scripts/FAISERVER/20-copy-mirror	2011-04-16 09:37:28 UTC (rev 6471)
+++ trunk/examples/simple/scripts/FAISERVER/20-copy-mirror	2011-04-16 09:38:07 UTC (rev 6472)
@@ -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: trunk/utils/mkdebmirror
===================================================================
--- trunk/utils/mkdebmirror	2011-04-16 09:37:28 UTC (rev 6471)
+++ trunk/utils/mkdebmirror	2011-04-16 09:38:07 UTC (rev 6472)
@@ -24,7 +24,7 @@
 
 debug="$@"
 arch=i386
-dist=lenny
+dist=squeeze
 
 destdir=/files/scratch/debmirror
 sect="--section main,contrib,non-free"
@@ -39,4 +39,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