[Fai-commit] r3929 - in trunk: . bin debian

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

Author: lange
Date: 2006-09-12 14:31:14 +0000 (Tue, 12 Sep 2006)
New Revision: 3929

Modified:
   trunk/NEWS
   trunk/bin/fai
   trunk/bin/fai-cd
   trunk/bin/fai-mirror
   trunk/bin/make-fai-bootfloppy
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
setting FAI_ETC_DIR is the same as specifying -C cfdir, default to /etc/fai


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-09-12 14:16:29 UTC (rev 3928)
+++ trunk/NEWS	2006-09-12 14:31:14 UTC (rev 3929)
@@ -48,7 +48,8 @@
     - fai-chboot: change in options, -d is now -D, -r is now -d, -r is
       not used any more
     - add policy-rc.d support
-    - move some -c to -C, so now all scripts use -C for cfdir
+    - move some -c to -C, so now all scripts use -C for cfdir, seting
+      $FAI_ETC_DIR does the same
     - fai-cd can now eject the CD after installation
     - fai-mirror remove option -a (now default), add -B
 

Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-09-12 14:16:29 UTC (rev 3928)
+++ trunk/bin/fai	2006-09-12 14:31:14 UTC (rev 3929)
@@ -145,7 +145,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main routine
 
-export FAI_ETC_DIR=/etc/fai
+# use FAI_ETC_DIR from environment variable
+[ -z "$FAI_ETC_DIR" ] && FAI_ETC_DIR=/etc/fai
+export FAI_ETC_DIR
+
 # Parse commandline options
 TEMP=$(getopt -o Nhvc:C: --long new,help,verbose,class:,cfdir: -n "$0" -- "$@")
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi

Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2006-09-12 14:16:29 UTC (rev 3928)
+++ trunk/bin/fai-cd	2006-09-12 14:31:14 UTC (rev 3929)
@@ -30,7 +30,7 @@
 #*********************************************************************
 
 set -e 
-version="fai-cd 2.3"
+version="fai-cd 2.4, 12 september 2006"
 
 burn=0
 hidedirs="/usr/share/locale /usr/share/doc /var/lib/apt /var/cache/apt /usr/share/man /var/lib/dpkg/info /media/mirror/aptcache /media/mirror/.apt-move"
@@ -172,6 +172,8 @@
        *) die 11 "fai-cd only works on i386 and maybe on amd64 architecture. Exiting."
 esac
 
+# use environment variable if defined
+[ -n "$FAI_ETC_DIR" ] && cfdir=$FAI_ETC_DIR
 # Parse commandline options
 while getopts "hg:bm:C:" opt ; do
     case "$opt" in

Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror	2006-09-12 14:16:29 UTC (rev 3928)
+++ trunk/bin/fai-mirror	2006-09-12 14:31:14 UTC (rev 3929)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 1.9, 12-sep-2006"
+version="Version 1.9.1, 12-sep-2006"
 
 # variables: NFSROOT, FAI_CONFIGDIR
 
@@ -216,6 +216,8 @@
 
 [ -x "$(which apt-move)" ] || die 5 "apt-move not found. Please install package."
 
+# use environment variable if defined
+[ -n "$FAI_ETC_DIR" ] && cfdir=$FAI_ETC_DIR
 preserve=0
 verbose=0
 add=1

Modified: trunk/bin/make-fai-bootfloppy
===================================================================
--- trunk/bin/make-fai-bootfloppy	2006-09-12 14:16:29 UTC (rev 3928)
+++ trunk/bin/make-fai-bootfloppy	2006-09-12 14:31:14 UTC (rev 3929)
@@ -27,8 +27,11 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 2.8, 11-september-2006"
+version="Version 2.8.1, 12-september-2006"
 set -e
+
+# use environment variable if defined
+[ -n "$FAI_ETC_DIR" ] && cfdir=$FAI_ETC_DIR
 timeout=15
 mkimage=0
 size=1440

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-09-12 14:16:29 UTC (rev 3928)
+++ trunk/bin/make-fai-nfsroot	2006-09-12 14:31:14 UTC (rev 3929)
@@ -42,6 +42,8 @@
     exit 9
 fi
 
+# use environment variable if defined
+[ -n "$FAI_ETC_DIR" ] && cfdir=$FAI_ETC_DIR
 kfile="vmlinuz" # some architectures use different names
 kernelname="$kfile-install"
 merror="properly"

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-09-12 14:16:29 UTC (rev 3928)
+++ trunk/debian/changelog	2006-09-12 14:31:14 UTC (rev 3929)
@@ -74,10 +74,10 @@
     fai-cd
   * fai-cd: use $FAI instead of /fai
   * fai-mirror: generate distrib name from FAI_DEBOOTSTRAP
-  * move some -c to -C, so now all scripts use -C for cfdir
-
+  * move some -c to -C, so now all scripts use -C for cfdir, setting
+    $FAI_ETC_DIR is the same as specifying -C cfdir
   
- -- Thomas Lange <lange at debian.org>  Tue, 12 Sep 2006 12:16:20 +0200
+ -- Thomas Lange <lange at debian.org>  Tue, 12 Sep 2006 16:30:19 +0200
 
 fai (2.10.5) unstable; urgency=high