[Fai-commit] r5857 - in trunk: debian examples/simple/scripts/FAIBASE

[Thomas Lange]

Author: lange
Date: 2010-07-09 22:06:05 +0000 (Fri, 09 Jul 2010)
New Revision: 5857

Modified:
   trunk/debian/changelog
   trunk/examples/simple/scripts/FAIBASE/40-misc
Log:
40-misc: replace cfengine script with shell script

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-09 21:08:02 UTC (rev 5856)
+++ trunk/debian/changelog	2010-07-09 22:06:05 UTC (rev 5857)
@@ -39,6 +39,7 @@
   * 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
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: trunk/examples/simple/scripts/FAIBASE/40-misc
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/40-misc	2010-07-09 21:08:02 UTC (rev 5856)
+++ trunk/examples/simple/scripts/FAIBASE/40-misc	2010-07-09 22:06:05 UTC (rev 5857)
@@ -1,26 +1,12 @@
-#! /usr/sbin/cfagent -f
+#! /bin/bash
 
-control:
-   any::
-   actionsequence = ( directories editfiles )
-   EditFileSize = ( 30000 )
+error=0 ; trap "error=$((error|1))" ERR
 
-directories:
-   any::
-	${target}/tmp mode=1777 owner=0 group=0
+chmod -c 1777 ${target}/tmp
+chown -c 0:0  ${target}/tmp
 
-editfiles:
-   any::
-	{ ${target}/etc/mailname
-	  AutoCreate
-          AppendIfNoSuchLine "${HOSTNAME}"
-	}
+ainsl -av ${target}/etc/mailname ${HOSTNAME}
+sed -i -e "s/^UTC.*/UTC=${UTC}/" $target/etc/default/rcS
+sed -i -e 's#/sbin/getty 38400#/sbin/getty -f /etc/issue.linuxlogo 38400#' ${target}/etc/inittab
 
-	{ ${target}/etc/default/rcS
-	  ReplaceAll "^UTC=.*" With "UTC=${UTC}"
-	}
-
-	{ ${target}/etc/inittab
-	  ReplaceAll "/sbin/getty 38400"
-		With "/sbin/getty -f /etc/issue.linuxlogo 38400"
-	}
+exit $error