[Fai-commit] r3928 - in trunk: . bin debian man

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-09-12 14:16:29 +0000 (Tue, 12 Sep 2006)
New Revision: 3928

Modified:
   trunk/NEWS
   trunk/bin/fai-mirror
   trunk/debian/changelog
   trunk/man/fai-mirror.1
Log:
fai-mirror: make -a default, remove -a, add -B


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-09-12 13:25:29 UTC (rev 3927)
+++ trunk/NEWS	2006-09-12 14:16:29 UTC (rev 3928)
@@ -50,6 +50,7 @@
     - add policy-rc.d support
     - move some -c to -C, so now all scripts use -C for cfdir
     - fai-cd can now eject the CD after installation
+    - fai-mirror remove option -a (now default), add -B
 
 New in FAI 2.10.5
 

Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror	2006-09-12 13:25:29 UTC (rev 3927)
+++ trunk/bin/fai-mirror	2006-09-12 14:16:29 UTC (rev 3928)
@@ -25,15 +25,12 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 1.8, 4-sep-2006"
+version="Version 1.9, 12-sep-2006"
 
 # variables: NFSROOT, FAI_CONFIGDIR
 
-set -a
+export FAI_ROOT=/ # do not execute in chroot
 
-FAI_ROOT=/ # do not execute in chroot
-set +a
-
 trap "umount_dirs" EXIT ERR
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 usage() {
@@ -221,11 +218,11 @@
 
 preserve=0
 verbose=0
-add=0
+add=1
 qflag=-qq
-while getopts "avhx:pc:C:" opt ; do
+while getopts "Bvhx:pc:C:" opt ; do
     case "$opt" in
-	a) add=1 ;;
+	B) add=0 ;;
 	C) cfdir=$OPTARG ;;
 	h) usage ;;
 	x) exclasses="$OPTARG";;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-09-12 13:25:29 UTC (rev 3927)
+++ trunk/debian/changelog	2006-09-12 14:16:29 UTC (rev 3928)
@@ -1,4 +1,4 @@
-fai (3~beta18) unstable; urgency=medium
+fai (3~beta19) unstable; urgency=medium
 
   * make pathes conform to FHS:
     (closes: #340608, #311524, #336650, #309554, #340609)
@@ -66,7 +66,7 @@
   * rename $DO_INIT_TASKS to $do_init_tasks
   * install_packages: add option -p
   * fai-mirror: use packages.nfsroot instead of packages.arch, check if
-    obsolete variables are used
+    obsolete variables are used, remove -a, add -B
   * add policy-rc.d support instead of diverting start-stop-daemon
   * remove varaible diskvar, use $LOGDIR/disk_var.sh instead
   * fai-debconf: use read-only temp file during reconfigure

Modified: trunk/man/fai-mirror.1
===================================================================
--- trunk/man/fai-mirror.1	2006-09-12 13:25:29 UTC (rev 3927)
+++ trunk/man/fai-mirror.1	2006-09-12 14:16:29 UTC (rev 3928)
@@ -1,7 +1,7 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH fai-mirror 1 "23 july 2006" "FAI 3"
+.TH fai-mirror 1 "12 september 2006" "FAI 3"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -51,10 +51,10 @@
 
 .SH OPTIONS
 .TP
-.BI \-a
-Add packages included in base.tgz and packages defined in
-make-fai-nfsroot.conf to the mirror. This option should be used almost
-always.
+.BI \-B
+Do not add packages included in base.tgz and packages defined in
+make-fai-nfsroot.conf to the mirror. By default all those packages are
+included in the mirror.
 .TP
 .BI "\-c " CLASS[,CLASS]
 Use only this list of classes for building the mirror. Can't be used