[Fai-commit] r6019 - in branches/stable/3.4: bin debian man

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:56:53 +0000 (Tue, 17 Aug 2010)
New Revision: 6019

Modified:
   branches/stable/3.4/bin/fai-mirror
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/man/fai-mirror.1
Log:
fai-mirror, fai-mirror.8: add option -m


Conflicts:

	debian/changelog

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

Modified: branches/stable/3.4/bin/fai-mirror
===================================================================
--- branches/stable/3.4/bin/fai-mirror	2010-08-17 12:56:49 UTC (rev 6018)
+++ branches/stable/3.4/bin/fai-mirror	2010-08-17 12:56:53 UTC (rev 6019)
@@ -6,7 +6,7 @@
 # fai-mirror -- create and manage a partial mirror for FAI
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2004-2009, Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2004-2010, Thomas Lange, lange at informatik.uni-koeln.de
 #
 #*********************************************************************
 # This program is free software; you can redistribute it and/or modify
@@ -197,7 +197,7 @@
 verbose=0
 add=1
 qflag=-qq
-while getopts "a:Bvhx:pc:C:" opt ; do
+while getopts "a:Bvhx:pc:C:m:" opt ; do
     case "$opt" in
 	a) arch=$OPTARG ;;
 	B) add=0 ;;
@@ -205,6 +205,7 @@
 	h) usage ;;
 	x) exclasses="$OPTARG";;
 	c) cclasses="$OPTARG";;
+	m) MAXPACKAGES="$OPTARG";;
 	p) preserve=1;;
 	v) verbose=1; vflag=-v; qflag='';;
 	?) die 1 "Unknown option";;

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:56:49 UTC (rev 6018)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:56:53 UTC (rev 6019)
@@ -95,6 +95,8 @@
     they are present
   * fai-cd: add checks if package download succeeded
   * fai-cd: fix, use grub.cfg for grub2
+  * fai-vol_id: cleanup code
+  * fai-mirror, fai-mirror.8: add option -m
   
  -- Thomas Lange <lange at debian.org>  Wed, 28 Jul 2010 16:28:51 -0400
 

Modified: branches/stable/3.4/man/fai-mirror.1
===================================================================
--- branches/stable/3.4/man/fai-mirror.1	2010-08-17 12:56:49 UTC (rev 6018)
+++ branches/stable/3.4/man/fai-mirror.1	2010-08-17 12:56:53 UTC (rev 6019)
@@ -1,7 +1,7 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH fai-mirror 1 "22 October 2009" "FAI 3.3"
+.TH fai-mirror 1 "28 July 2010" "FAI 4.0"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -71,6 +71,9 @@
 .BI \-h
 Show simple help and version.
 .TP
+.BI "\-m " MAX
+Set the number of packages to NUM. This overwrites the variable MAXPACKAGES.
+.TP
 .BI "\-x " CLASS[,CLASS]
 Exclude these classes. Do not add the packages of these classes to
 the mirror.