[Fai-commit] r5578 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2009-10-20 14:04:35 +0000 (Tue, 20 Oct 2009)
New Revision: 5578

Modified:
   trunk/debian/changelog
   trunk/lib/get-config-dir
Log:
get-config-dir, get-config-dir-file: print more info, print warning if
no method is defined

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-20 13:44:44 UTC (rev 5577)
+++ trunk/debian/changelog	2009-10-20 14:04:35 UTC (rev 5578)
@@ -86,7 +86,8 @@
   * get-config-dir-cvs, fai-do-scripts: replace basename and dirname calls
     with bash functions
   * dhcpd.conf: change path of pxelinux.0
-  * get-config-dir, get-config-dir-file: print more info
+  * get-config-dir, get-config-dir-file: print more info, print warning if
+    no method is defined
   * get-config-dir, fai: set FAI to local path, if FAI_CONFIG_SRC is of
     type file: (closes: #481137)
   * fai-setup: add advertisement for FAI questionnaire

Modified: trunk/lib/get-config-dir
===================================================================
--- trunk/lib/get-config-dir	2009-10-20 13:44:44 UTC (rev 5577)
+++ trunk/lib/get-config-dir	2009-10-20 14:04:35 UTC (rev 5578)
@@ -26,6 +26,13 @@
 # the "major" protocol name is the one up to the first "+", if it exists
 method=$(expr match "$FAI_CONFIG_SRC" '\([^+]*\).*://')
 
+if [ -z "$method" ]; then
+	sendmon "TASKERROR get_fai_dir 22"
+	echo "Error in get-config-dir: scheme undefined."
+	exit 24
+    echo
+fi
+
 # run get-config-dir-$method script if it exists
 if which get-config-dir-$method &>/dev/null ; then
 	get-config-dir-$method