[Fai-commit] r3651 - in trunk: bin examples/simple/scripts/AMD64 examples/simple/scripts/DEMO examples/simple/scripts/FAIBASE

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-07-23 10:39:31 +0000 (Sun, 23 Jul 2006)
New Revision: 3651

Modified:
   trunk/bin/fai-do-scripts
   trunk/examples/simple/scripts/AMD64/99-discover-bug
   trunk/examples/simple/scripts/DEMO/30-demo
   trunk/examples/simple/scripts/FAIBASE/40-misc
Log:
migrate from cfengine1 to cfengine2 (closes: 305362)


Modified: trunk/bin/fai-do-scripts
===================================================================
--- trunk/bin/fai-do-scripts	2006-07-23 10:25:17 UTC (rev 3650)
+++ trunk/bin/fai-do-scripts	2006-07-23 10:39:31 UTC (rev 3651)
@@ -112,7 +112,7 @@
 	*"cfagent"*)
 	    echo "Executing cfagent: $file"
 	    echo "=====   cfagent: $file   =====" >> $LOGDIR/cfagent.log 2>&1
-	    ./$file -v -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
 	;;
 

Modified: trunk/examples/simple/scripts/AMD64/99-discover-bug
===================================================================
--- trunk/examples/simple/scripts/AMD64/99-discover-bug	2006-07-23 10:25:17 UTC (rev 3650)
+++ trunk/examples/simple/scripts/AMD64/99-discover-bug	2006-07-23 10:39:31 UTC (rev 3651)
@@ -1,10 +1,9 @@
-#! /usr/bin/cfengine
+#! /usr/bin/cfagent -f
 
 # this is a workaround for bug #343338
 
 control:
    any::
-   OutputPrefix = ( "cfengine" )
    actionsequence = ( editfiles )
    EditFileSize = ( 30000 )
 

Modified: trunk/examples/simple/scripts/DEMO/30-demo
===================================================================
--- trunk/examples/simple/scripts/DEMO/30-demo	2006-07-23 10:25:17 UTC (rev 3650)
+++ trunk/examples/simple/scripts/DEMO/30-demo	2006-07-23 10:39:31 UTC (rev 3651)
@@ -1,9 +1,8 @@
-#! /usr/bin/cfengine
+#! /usr/bin/cfagent -f
 
 control:
    any::
-   OutputPrefix = ( "cfengine" )
-   actionsequence = ( files directories editfiles )
+   actionsequence = ( files editfiles )
    EditFileSize = ( 30000 )
 
 files:
@@ -13,11 +12,9 @@
         ${target}/dev include=fd* mode=666   action=fixall r=1
         ${target}/dev include=sr* mode=444   action=fixall r=1
 
-directories:
-
 editfiles:
    any::
 
 	{ ${target}/etc/init.d/sysklogd
-	  ReplaceAll "^SYSLOGD=.*" With "SYSLOGD=${dblquote}-m 360${dblquote}"
+	  ReplaceAll "^SYSLOGD=.*" With 'SYSLOGD="-m 360"'
 	}

Modified: trunk/examples/simple/scripts/FAIBASE/40-misc
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/40-misc	2006-07-23 10:25:17 UTC (rev 3650)
+++ trunk/examples/simple/scripts/FAIBASE/40-misc	2006-07-23 10:39:31 UTC (rev 3651)
@@ -1,14 +1,10 @@
-#! /usr/bin/cfengine
+#! /usr/bin/cfagent -f
 
 control:
    any::
-   OutputPrefix = ( "cfengine" )
-   actionsequence = ( files directories editfiles )
+   actionsequence = ( directories editfiles )
    EditFileSize = ( 30000 )
 
-files:
-   any::
-
 directories:
    any::
 	${target}/tmp mode=1777 owner=0 group=0