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

[Thomas Lange]

Author: lange
Date: 2009-10-20 10:40:04 +0000 (Tue, 20 Oct 2009)
New Revision: 5570

Modified:
   trunk/bin/fai
   trunk/debian/NEWS
   trunk/debian/changelog
Log:
  dirinstall now uses $FAI_CONFIG_SRC instead of $FAI_CONFIGDIR

Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2009-10-20 10:34:40 UTC (rev 5569)
+++ trunk/bin/fai	2009-10-20 10:40:04 UTC (rev 5570)
@@ -136,12 +136,10 @@
     unset etc_message
     task confdir
     # if the config space is a local directory, reset $FAI
-    if [ -n "$FAI_CONFIG_SRC" ]; then
-	local method=$(expr match "$FAI_CONFIG_SRC" '\([^+]*\).*://')
-	if [ $method = "file" ]; then
-	    local localpath=$(expr match "$FAI_CONFIG_SRC" '.*://\(/.*\)')
-	    export FAI=$localpath
-	fi
+    local method=$(expr match "$FAI_CONFIG_SRC" '\([^+]*\).*://')
+    if [ $method = "file" ]; then
+	local localpath=$(expr match "$FAI_CONFIG_SRC" '.*://\(/.*\)')
+	export FAI=$localpath
     fi
     task setup
     task defclass
@@ -302,15 +300,6 @@
 fai_init
 [ -n "$newhostname" ] && echo "Hostname set to $HOSTNAME" | tee -a $LOGDIR/fai.log
 unset newhostname
-if [ X$action = Xdirinstall ]; then
-    skiptask confdir
-    # dirinstall still uses FAI_CONFIGDIR, which is wrong IMO. It
-    # should use FAI_CONFIG_SRC
-    FAI_CONFIGDIR=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $FAI_CONFIGDIR)
-    export FAI=$FAI_CONFIGDIR
-    # TODO: add a check here if we have a lcoation/URL for the config space
-    set -a
-fi
 
 # remove this crap, use old thing
 mkfifo $LOGDIR/logfifo

Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS	2009-10-20 10:34:40 UTC (rev 5569)
+++ trunk/debian/NEWS	2009-10-20 10:40:04 UTC (rev 5570)
@@ -4,6 +4,7 @@
   - automatic tests are now supported
   - cvs, bootpc, expect and mdetect are not installed by default into the
     nfsroot
+  - dirinstall now uses FAI_CONFIG_SRC instead of FAI_CONFIGDIR
   
  -- Thomas Lange <lange at debian.org>  Tue, 20 Oct 2009 12:33:43 +0200
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-20 10:34:40 UTC (rev 5569)
+++ trunk/debian/changelog	2009-10-20 10:40:04 UTC (rev 5570)
@@ -90,6 +90,7 @@
   * fai-setup: add advertisement for FAI questionnaire
   * README: upgrade info about mailing list, add info about questionnaire
   * fai: check if make-fai-nfsroot.conf is available if dirinstall is used
+    dirinstall now uses $FAI_CONFIG_SRC instead of $FAI_CONFIGDIR
   * control: update to standards version 3.8.3, no changes needed
   * Fstab.pm: print uuid and label of partition to console
   * NFSROOT, make-fai-nfsroot.conf: remove dhcp3-client and dhcp-client,