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

[Thomas Lange]

Author: lange
Date: 2009-04-16 15:07:48 +0000 (Thu, 16 Apr 2009)
New Revision: 5338

Modified:
   trunk/debian/changelog
   trunk/lib/subroutines-linux
Log:
  parsing boot.log, use = and strip off any quotes (closes: #439250),
  check earlier if faimond is available, send TASKBEGIN message

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-16 14:41:35 UTC (rev 5337)
+++ trunk/debian/changelog	2009-04-16 15:07:48 UTC (rev 5338)
@@ -15,7 +15,8 @@
     improve test if $debug is set to 1 (closes: #496072)
     call cfagent scripts with -v if fai is in debug mode
   * lib/subroutines-linux: don't rely on ' as a field separator when
-    parsing boot.log, use = and strip off any quotes (closes: #439250)
+    parsing boot.log, use = and strip off any quotes (closes: #439250),
+    check earlier if faimond is available, send TASKBEGIN message
   * lib/get-config-dir-svn: Make username in svn:// config url optional
     (thanks Alexander Fisher) (closes: #441436)
   * bin/fai-setup: Do not unconditionally add $FAI_CONFIGDIR to exports(5)

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2009-04-16 14:41:35 UTC (rev 5337)
+++ trunk/lib/subroutines-linux	2009-04-16 15:07:48 UTC (rev 5338)
@@ -74,16 +74,6 @@
         create_resolv_conf
     fi
     define_fai_flags
-    get-config-dir || {
-	echo "Problems accessing the config space."
-	die ""
-    }
-    # now you have enough time to make changes to the config space
-    if [ -n "$flag_wait" ]; then
-	echo "Sleeping. Now you may change the config space in $FAI."
-	echo "Continue after killall sleep."
-	sleep 50000
-    fi
 
     # check if monitor server is available
     [ -z "$monserver" ] && monserver=$SERVER
@@ -95,10 +85,22 @@
     sendhostname=$HOSTNAME # save current hostname
     if sendmon check; then
 	echo "Monitoring to server $monserver enabled."
+	sendmon "TASKBEGIN confdir"
     else
 	faimond=0
 	echo "Can't connect to monserver on $monserver port 4711. Monitoring disabled."
     fi
+
+    get-config-dir || {
+	echo "Problems accessing the config space."
+	die ""
+    }
+    # now you have enough time to make changes to the config space
+    if [ -n "$flag_wait" ]; then
+	echo "Sleeping. Now you may change the config space in $FAI."
+	echo "Continue after killall sleep."
+	sleep 50000
+    fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ### BEGIN SUBROUTINE INFO