[Fai-commit] r4145 - in people/h01ger/fai-sarge: debian scripts

[Holger Levsen]

Author: h01ger-guest
Date: 2006-11-05 13:56:23 +0100 (Sun, 05 Nov 2006)
New Revision: 4145

Modified:
   people/h01ger/fai-sarge/debian/changelog
   people/h01ger/fai-sarge/debian/control
   people/h01ger/fai-sarge/scripts/fai-do-scripts
Log:
- fixes for cfengine2


Modified: people/h01ger/fai-sarge/debian/changelog
===================================================================
--- people/h01ger/fai-sarge/debian/changelog	2006-11-05 11:38:49 UTC (rev 4144)
+++ people/h01ger/fai-sarge/debian/changelog	2006-11-05 12:56:23 UTC (rev 4145)
@@ -1,3 +1,15 @@
+fai (2.8.4sarge1.h01ger.6) stable; urgency=low
+
+  * call cfagent differently so it works :) (taken from trunk) 
+
+ -- Holger Levsen <debian at layer-acht.org>  Sun,  5 Nov 2006 13:11:46 +0100
+
+fai (2.8.4sarge1.h01ger.5) stable; urgency=low
+
+  * added alternative depends on cfengine2 for use in etch
+
+ -- Holger Levsen <debian at layer-acht.org>  Sat,  4 Nov 2006 20:24:50 +0100
+
 fai (2.8.4sarge1.h01ger.4) stable; urgency=low
 
   * added depends on cfengine 

Modified: people/h01ger/fai-sarge/debian/control
===================================================================
--- people/h01ger/fai-sarge/debian/control	2006-11-05 11:38:49 UTC (rev 4144)
+++ people/h01ger/fai-sarge/debian/control	2006-11-05 12:56:23 UTC (rev 4145)
@@ -8,7 +8,7 @@
 
 Package: fai
 Architecture: all
-Depends: perl, libapt-pkg-perl, subversion, file, cfengine
+Depends: perl, libapt-pkg-perl, subversion, file, cfengine | cfengine2
 Recommends: debootstrap, nfs-kernel-server | nfs-server, fai-kernels, dhcp3-server | bootp, tftpd-hpa | tftpd, rsh-server, wget, syslinux
 Suggests: ssh, debmirror, mknbi, apt-move, mkinitrd-cd, grub
 Description:  Fully Automatic Installation

Modified: people/h01ger/fai-sarge/scripts/fai-do-scripts
===================================================================
--- people/h01ger/fai-sarge/scripts/fai-do-scripts	2006-11-05 11:38:49 UTC (rev 4144)
+++ people/h01ger/fai-sarge/scripts/fai-do-scripts	2006-11-05 12:56:23 UTC (rev 4145)
@@ -110,7 +110,7 @@
 	*"cfagent"*)
 	    echo "Executing cfagent: $file"
 	    echo "=====   cfagent: $file   =====" >> $LOGDIR/cfagent.log 2>&1
-	    ./$file --no-lock -v -f $file -D${cfclasses} >> $LOGDIR/cfagent.log 2>&1
+	    ./$file -qKkI -D${cfclasses} >> $LOGDIR/cfagent.log 2>&1
 	    fc_check_status $file $? | tee -a $LOGDIR/cfagent.log
 	;;