[Fai-commit] r5576 - in trunk: debian utils

[Thomas Lange]

Author: lange
Date: 2009-10-20 13:43:01 +0000 (Tue, 20 Oct 2009)
New Revision: 5576

Modified:
   trunk/debian/changelog
   trunk/utils/mkdebmirror
Log:
* NEWS: add hint about missing packages in nfsroot, changes in
  dirinstall
* mkdebmirror: update for lenny, use cache feature of debmirror > 2

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-20 12:50:45 UTC (rev 5575)
+++ trunk/debian/changelog	2009-10-20 13:43:01 UTC (rev 5576)
@@ -1,6 +1,8 @@
 fai (3.2.23~beta23) unstable; urgency=low
 
   [ Thomas Lange ]
+  * NEWS: add hint about missing packages in nfsroot, changes in
+    dirinstall
   * 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
@@ -96,7 +98,7 @@
   * NFSROOT, make-fai-nfsroot.conf: remove dhcp3-client and dhcp-client,
     since it's now in the default configuration of debootstrap
   * NFSROOT: remove cvs, bootpc, expect, mdetect
-  * NEWS: add hint about missing packages in nfsroot
+  * mkdebmirror: update for lenny, use cache feature of debmirror > 2
   
   [ Michael Tautschnig ]
   * setup-storage, setup-storage/Exec.pm: auto-detect a proper way to tell

Modified: trunk/utils/mkdebmirror
===================================================================
--- trunk/utils/mkdebmirror	2009-10-20 12:50:45 UTC (rev 5575)
+++ trunk/utils/mkdebmirror	2009-10-20 13:43:01 UTC (rev 5576)
@@ -1,19 +1,20 @@
 #! /bin/sh
 
 # $Id$
-# Thomas Lange, lange at informatik.uni-koeln.de, (c) 2001-2008
+# Thomas Lange, lange at informatik.uni-koeln.de, (c) 2001-2009
 
 # create partial debian mirror using command debmirror(1)
+# you should use debmirror > 2.0 because of the very nice cache feature
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 update_from() {
 
     # update local mirror from a host
     host=$1
-    defopt="$allopt --host=$host --dist=$dist"
+    defopt="--pdiff=none $allopt --host=$host --dist=$dist $sect $*"
 
     echo "------------------ create mirror for debian ------------------"
-    debmirror --getcontents $destdir/debian $defopt
+    debmirror $destdir/debian $defopt
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # main program
@@ -23,18 +24,18 @@
 
 debug="$@"
 arch=i386
-dist=etch,etch-proposed-updates
+dist=lenny
 
 destdir=/files/scratch/debmirror
+sect="--section main,contrib,non-free"
+allopt="$debug --state-cache-days=100 --ignore-missing-release --ignore-release-gpg --passive --nosource --arch=$arch"
 
-allopt="$debug --ignore-missing-release --ignore-release-gpg --passive --nosource --arch=$arch --ignore=disks-$arch/"
-
 # first sync from a mirror near to you
 #update_from ftp.uni-koeln.de
 
 # since this mirror is not always up to date, sync the rest from an official mirror
-update_from ftp.de.debian.org
+update_from ftp.de.debian.org --getcontents
 
 # 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  --section main,contrib,non-free -d etch/updates
+debmirror $destdir/debian-security $allopt --host=security.debian.org -r debian-security $sect -d lenny/updates