[Fai-commit] r6283 - in trunk: conf debian examples/simple/scripts/LAST

[Michael Goetze]

Author: mgoetze-guest
Date: 2011-02-10 22:31:58 +0000 (Thu, 10 Feb 2011)
New Revision: 6283

Modified:
   trunk/conf/NFSROOT
   trunk/debian/NEWS
   trunk/examples/simple/scripts/LAST/50-misc
Log:
Remove cfengine2 from default NFSROOT, as it is no longer needed for the simple-examples. Only do cfengine cleanup if it is installed.

Modified: trunk/conf/NFSROOT
===================================================================
--- trunk/conf/NFSROOT	2011-02-10 14:56:40 UTC (rev 6282)
+++ trunk/conf/NFSROOT	2011-02-10 22:31:58 UTC (rev 6283)
@@ -11,7 +11,7 @@
 cupt
 
 # needed for the simple examples
-cfengine2 libapt-pkg-perl
+libapt-pkg-perl
 
 # you should not edit the lines below
 # architecture dependend list of packages that are installed

Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS	2011-02-10 14:56:40 UTC (rev 6282)
+++ trunk/debian/NEWS	2011-02-10 22:31:58 UTC (rev 6283)
@@ -2,6 +2,7 @@
 
   - old tool setup_harddisks removed. Use setup-storage instead
   - a tarball of the config space can be received via http
+  - cfengine2 is no longer installed into the nfsroot by default
 
  -- Thomas Lange <lange at debian.org>  Fri, 09 Jul 2010 16:21:32 +0200
 

Modified: trunk/examples/simple/scripts/LAST/50-misc
===================================================================
--- trunk/examples/simple/scripts/LAST/50-misc	2011-02-10 14:56:40 UTC (rev 6282)
+++ trunk/examples/simple/scripts/LAST/50-misc	2011-02-10 22:31:58 UTC (rev 6283)
@@ -4,11 +4,13 @@
 
 error=0 ; trap "error=$((error|1))" ERR
 
-# remove backup files from cfengine
-dirs="root etc var"
-for path in $dirs; do
-    find $target/$path -maxdepth 20 -name \*.cfedited -o -name \*.cfsaved | xargs -r rm
-done
+# remove backup files from cfengine, but only if cfengine is installed
+if [ -x /usr/sbin/cfagent ] || [ -x $target/usr/sbin/cfagent ] ; then
+    dirs="root etc var"
+    for path in $dirs; do
+	find $target/$path -maxdepth 20 -name \*.cfedited -o -name \*.cfsaved | xargs -r rm
+    done
+fi
 
 [ "$FAI_DEBMIRROR" ] && 
   ainsl $target/etc/fstab "#$FAI_DEBMIRROR $MNTPOINT nfs ro 0 0"