[Fai-commit] r5997 - in branches/stable/3.4: bin debian

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:55:13 +0000 (Tue, 17 Aug 2010)
New Revision: 5997

Modified:
   branches/stable/3.4/bin/fai-do-scripts
   branches/stable/3.4/debian/changelog
Log:
fai-do-scripts: add cfengine 3 support


Conflicts:

	debian/changelog

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/bin/fai-do-scripts
===================================================================
--- branches/stable/3.4/bin/fai-do-scripts	2010-08-17 12:55:08 UTC (rev 5996)
+++ branches/stable/3.4/bin/fai-do-scripts	2010-08-17 12:55:13 UTC (rev 5997)
@@ -5,7 +5,7 @@
 # fai-do-scripts - call configuration scripts for every defined class
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2003-2009 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2003-2010 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -26,7 +26,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="version 1.7.1, 1-nov-2009"
+version="version 1.8, 10-july-2010"
 
 # variables needed: $classes, $cfclasses, $LOGDIR
 # 
@@ -116,6 +116,14 @@
 	    fc_check_status $file $exitcode | tee -a $LOGDIR/shell.log
 	;;
 
+	*"cf-agent"*)
+	    echo "Executing cf-agent: $file"
+	    echo "=====   cf-agent: $file   =====" >> $LOGDIR/cfagent.log 2>&1
+	    ./$file $cfagentdebug -KI -D${cfclasses} >> $LOGDIR/cfagent.log 2>&1
+	    savemaxstatus $?
+	    fc_check_status $file $exitcode | tee -a $LOGDIR/cfagent.log
+	;;
+
 	*"cfagent"*)
 	    echo "Executing cfagent: $file"
 	    echo "=====   cfagent: $file   =====" >> $LOGDIR/cfagent.log 2>&1
@@ -157,7 +165,7 @@
     local ex
     ex=$1
     cat <<-EOF
-        fai-do-scripts $version. Copyright (C) 2003-2009 Thomas Lange
+        fai-do-scripts $version. Copyright (C) 2003-2010 Thomas Lange
         Read the manual page fai-do-scripts(1) for more information.
 
         Usage: fai-do-scripts [OPTION] DIRECTORY

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:55:08 UTC (rev 5996)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:55:13 UTC (rev 5997)
@@ -1,4 +1,4 @@
-fai (3.4~beta4) unstable; urgency=low
+fai (3.4~beta5) unstable; urgency=low
 
   [ Thomas Lange ]
   * dhcp-edit: new command that adds or removes entries to/from dhcpd.conf
@@ -31,6 +31,16 @@
   * fai-client.install: remove list_disks
   * 10-misc, subroutines: move adding /etc/hosts entry from task_prepareapt
     to config space script, add only if host does not belong to class DHCPC
+  * make-fai-nfsroot: add test if etc/init is available
+  * fai-client.install, copyright, bootexample.txt, fai-guide.txt,
+    subroutines, THANKS, setup-storage.8, Makefile, FAIBASE.var: remove
+    setup_harddisks and variable USE_SETUP_STORAGE
+  * NEWS: add info about setup_harddisks removal
+  * fai-mirror, control: replace apt-move by reprepro
+  * 99-discover-bug: remove unused script
+  * 30-demo: replace script with shell code in 10-misc
+  * 40-misc: replace cfengine script with shell script
+  * fai-do-scripts: add cfengine 3 support
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks
@@ -49,7 +59,7 @@
     $FAI_ROOT, so let's get rid of them outside the chroot as well iff
     they are present
 
- -- Thomas Lange <lange at debian.org>  Fri, 25 Jun 2010 14:29:10 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 09 Jul 2010 16:11:07 +0200
 
 fai (3.3.5) unstable; urgency=high