[Fai-commit] r5543 - in trunk: bin debian lib

[Thomas Lange]

Author: lange
Date: 2009-10-16 13:20:41 +0000 (Fri, 16 Oct 2009)
New Revision: 5543

Modified:
   trunk/bin/fai
   trunk/debian/changelog
   trunk/lib/get-config-dir
Log:
get-config-dir, fai: set FAI to local path, if FAI_CONFIG_SRC is of
type file: (closes: #481137)

Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2009-10-16 13:19:45 UTC (rev 5542)
+++ trunk/bin/fai	2009-10-16 13:20:41 UTC (rev 5543)
@@ -135,6 +135,12 @@
     [ $do_init_tasks -eq 1 ] || echo "Using configuration files from $FAI_ETC_DIR"
     unset etc_message
     task confdir
+    # if the config space is a local directory, reset $FAI
+    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
     unset cmdlineclasses renewclass

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-16 13:19:45 UTC (rev 5542)
+++ trunk/debian/changelog	2009-10-16 13:20:41 UTC (rev 5543)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta19) unstable; urgency=low
+fai (3.2.23~beta20) unstable; urgency=low
 
   [ Thomas Lange ]
   * subroutines-linux: fix log message
@@ -82,6 +82,8 @@
     with bash functions
   * dhcpd.conf: change path of pxelinux.0
   * get-config-dir, get-config-dir-file: print more info
+  * get-config-dir, fai: set FAI to local path, if FAI_CONFIG_SRC is of
+    type file: (closes: #481137)
   
   [ Michael Tautschnig ]
   * setup-storage, setup-storage/Exec.pm: auto-detect a proper way to tell
@@ -123,7 +125,7 @@
   [ Holger Levsen ]
   * update to standards version 3.8.2, no changes needed
  
- -- Thomas Lange <lange at debian.org>  Fri, 16 Oct 2009 14:08:57 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 16 Oct 2009 15:20:14 +0200
 
 fai (3.2.20) unstable; urgency=low
 

Modified: trunk/lib/get-config-dir
===================================================================
--- trunk/lib/get-config-dir	2009-10-16 13:19:45 UTC (rev 5542)
+++ trunk/lib/get-config-dir	2009-10-16 13:20:41 UTC (rev 5543)
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # (c) 2006 Henning Glawe <glaweh at debian.org>
+# (c) 2009 Thomas Lange  <lange at debian.org>
 
 ### BEGIN SUBROUTINE INFO
 # Provides-Var:
@@ -34,7 +35,12 @@
 	exit 22
 fi
 
-ln -s $FAI /var/run/fai/current_config
+if [ $method = "file" ]; then
+    localpath=$(expr match "$FAI_CONFIG_SRC" '.*://\(/.*\)')
+    export FAI=$localpath
+fi
+
+ln -sf $FAI /var/run/fai/current_config
 if [ ! -d $FAI/class ]; then
 	echo "WARNING: directory $FAI/class not found."
 	sendmon "TASKERROR get_fai_dir 23"