[Fai-commit] r5329 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2009-04-15 21:37:41 +0000 (Wed, 15 Apr 2009)
New Revision: 5329

Modified:
   trunk/bin/fai-mirror
   trunk/debian/changelog
Log:
fai-mirror: check if -C was used, (thanks to James Richardson for the
patch) (closes: #523625)

Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror	2009-04-15 21:16:16 UTC (rev 5328)
+++ trunk/bin/fai-mirror	2009-04-15 21:37:41 UTC (rev 5329)
@@ -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-2007, Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2004-2009, Thomas Lange, lange at informatik.uni-koeln.de
 #
 #*********************************************************************
 # This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 1.9.12, 4-december-2008"
+version="Version 1.9.13, 15-april-2009"
 
 # variables: NFSROOT, FAI_CONFIGDIR, FAI_ETC_DIR
 
@@ -243,7 +243,10 @@
 if [ -n "$FAI_ETC_DIR" -a -z "$cfdir" ]; then
     echo "Using environment variable \$FAI_ETC_DIR."
 fi
-cfdir=${FAI_ETC_DIR:=/etc/fai}
+# use -C option if present otherwise use $FAI_ETC_DIR or default to /etc/fai
+if [ -z "$cfdir" ]; then
+    cfdir=${FAI_ETC_DIR:=/etc/fai}
+fi
 cfdir=$(readlink -f $cfdir) # canonicalize path
 if [ ! -d "$cfdir" ]; then
     echo "$cfdir is not a directory"

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-15 21:16:16 UTC (rev 5328)
+++ trunk/debian/changelog	2009-04-15 21:37:41 UTC (rev 5329)
@@ -23,6 +23,8 @@
   * fai-cd, make-fai-nfsroot: awk can also do the grep
   * NFSROOT: install aMD64 apckages with aptitude, this also helps when
     building an amd64 nfsroot on i386
+  * fai-mirror: check if -C was used, (thanks to James Richardson for the
+    patch) (closes: #523625)
 
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.0.4
@@ -91,7 +93,7 @@
   * setup-storage/Parser.pm: Only test for mkfs.X if such a filesystem is to
     be created (i.e., it will not be preserved)
 
- -- Thomas Lange <lange at debian.org>  Wed, 15 Apr 2009 23:13:31 +0200
+ -- Thomas Lange <lange at debian.org>  Wed, 15 Apr 2009 23:37:21 +0200
 
 fai (3.2.17) unstable; urgency=medium