diff -r a9cbdfa9697a -r 67831a9de168 cfengine/rc.cfengine
--- a/cfengine/rc.cfengine	Mon Sep 17 19:12:11 2012 +0200
+++ b/cfengine/rc.cfengine	Mon Sep 17 19:13:34 2012 +0200
@@ -5,8 +5,9 @@
 
 %config
     cfengine_enable="$openpkg_rc_def"
-    cfengine_cservd_flags=""
-    cfengine_cenvd_flags=""
+    cfengine_cfserverd_flags=""
+    cfengine_cfexecd_flags=""
+    cfengine_cfmonitord_flags=""
     cfengine_log_prolog="true"
     cfengine_log_epilog="true"
     cfengine_log_numfiles="10"
@@ -14,15 +15,19 @@
     cfengine_log_complevel="9"
 
 %common
-    cfengine_cfservd_pidfile="@l_prefix@/var/cfengine/cfservd.pid"
-    cfengine_cfenvd_pidfile="@l_prefix@/var/cfengine/cfenvd.pid"
+    cfengine_cfserverd_pidfile="@l_prefix@/var/cfengine/cf-serverd.pid"
+    cfengine_cfexecd_pidfile="@l_prefix@/var/cfengine/cf-execd.pid"
+    cfengine_cfmonitord_pidfile="@l_prefix@/var/cfengine/cf-monitord.pid"
     cfengine_signal () {
-        [ -f $cfengine_cfservd_pidfile ] \
-            && kill -$1 `cat $cfengine_cfservd_pidfile`
+        [ -f $cfengine_cfserverd_pidfile ] \
+            && kill -$1 `cat $cfengine_cfserverd_pidfile`
         local rc=$?
-        [ -f $cfengine_cfenvd_pidfile ] \
-            && kill -$1 `cat $cfengine_cfenvd_pidfile` \
-            && [ $rc -eq 0 ]
+        [ -f $cfengine_cfexecd_pidfile ] \
+            && kill -$1 `cat $cfengine_cfexecd_pidfile` \
+            || [ $rc -eq 0 ]
+        [ -f $cfengine_cfmonitord_pidfile ] \
+            && kill -$1 `cat $cfengine_cfmonitord_pidfile` \
+            || [ $rc -eq 0 ]
     }
 
 %status -u @l_susr@ -o
@@ -37,24 +42,18 @@
 %start -u @l_susr@
     rcService cfengine enable yes || exit 0
     rcService cfengine active yes && exit 0
-    ( nohup @l_prefix@/sbin/cfservd \
-          --no-fork $cfengine_cfservd_flags \
-          </dev/null >/dev/null 2>&1 &
-      echo $! >$cfengine_cfservd_pidfile
-    ) >/dev/null 2>&1
-    ( nohup @l_prefix@/sbin/cfenvd \
-          --no-fork $cfengine_cfenvd_flags \
-          </dev/null >/dev/null 2>&1 &
-      echo $! >$cfengine_cfenvd_pidfile
-    ) >/dev/null 2>&1
+    @l_prefix@/var/cfengine/bin/cf-serverd $cfengine_cfserverd_flags 
+    @l_prefix@/var/cfengine/bin/cf-execd $cfengine_cfexecd_flags 
+    @l_prefix@/var/cfengine/bin/cf-monitord $cfengine_cfmonitord_flags 
 
 %stop -u @l_susr@
     rcService cfengine enable yes || exit 0
     rcService cfengine active no  && exit 0
     cfengine_signal TERM
     sleep 2
-    rm -f $cfengine_cfservd_pidfile 2>/dev/null || true
-    rm -f $cfengine_cfenvd_pidfile  2>/dev/null || true
+    rm -f $cfengine_cfserverd_pidfile 2>/dev/null || true
+    rm -f $cfengine_cfexecd_pidfile  2>/dev/null || true
+    rm -f $cfengine_cfmonitord_pidfile  2>/dev/null || true
 
 %restart -u @l_susr@
     rcService cfengine enable yes || exit 0