packages: policyd/policyd.init, policyd/policyd.sysconfig - updated startup...

[glen]

Author: glen                         Date: Mon Jan  3 13:25:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated startup/stop to v2
- POLICYD_CONF renamed to CLUEBRINGER_CONF for upgrade to pick new config

---- Files affected:
packages/policyd:
   policyd.init (1.11 -> 1.12) , policyd.sysconfig (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/policyd/policyd.init
diff -u packages/policyd/policyd.init:1.11 packages/policyd/policyd.init:1.12
--- packages/policyd/policyd.init:1.11	Mon Jan  3 14:23:37 2011
+++ packages/policyd/policyd.init	Mon Jan  3 14:25:36 2011
@@ -19,8 +19,10 @@
 . /etc/sysconfig/network
 
 # Get service config
-[ -r /etc/sysconfig/policyd ] && . /etc/sysconfig/policyd || \
-	POLICYD_CONF="/etc/policyd/policyd.conf"
+CLUEBRINGER_CONF="/etc/policyd/cluebringer.conf"
+if [ -r /etc/sysconfig/policyd ]; then
+	. /etc/sysconfig/policyd
+fi
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
@@ -40,7 +42,7 @@
 	fi
 
 	msg_starting "PolicyD"
-	daemon $SERVICE_RUN_NICE_LEVEL /usr/lib/policyd/policyd -c "${POLICYD_CONF}"
+	daemon $SERVICE_RUN_NICE_LEVEL /usr/sbin/cbpolicyd --config "$CLUEBRINGER_CONF"
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/policyd
 }
@@ -53,12 +55,12 @@
 	fi
 
 	msg_stopping "PolicyD"
-	killproc policyd
+	killproc cbpolicyd
 	rm -f /var/lock/subsys/policyd
 }
 
 condrestart() {
-	if [ ! -f /var/lock/subsys/<service> ]; then
+	if [ ! -f /var/lock/subsys/policyd ]; then
 		msg_not_running "PolicyD"
 		RETVAL=$1
 		return
@@ -72,12 +74,12 @@
 	if [ -r /var/run/policyd.lck ]; then
 		echo "PolicyD cleanup process already running." 1>&2
 		RETVAL=1
-	elif [ ! -r "${POLICYD_CONF}" ]; then
-		echo "PolicyD configuration file not found: ${POLICYD_CONF}" 1>&2
+	elif [ ! -r "${CLUEBRINGER_CONF}" ]; then
+		echo "PolicyD configuration file not found: ${CLUEBRINGER_CONF}" 1>&2
 		RETVAL=1
 	else
 		touch /var/run/policyd.lck
-		/usr/lib/policyd/cleanup -c "${POLICYD_CONF}"
+		/usr/lib/policyd/cleanup -c "${CLUEBRINGER_CONF}"
 		RETVAL=$?
 		rm -f /var/run/policyd.lck
 	fi

================================================================
Index: packages/policyd/policyd.sysconfig
diff -u packages/policyd/policyd.sysconfig:1.4 packages/policyd/policyd.sysconfig:1.5
--- packages/policyd/policyd.sysconfig:1.4	Mon Jan  3 13:33:29 2011
+++ packages/policyd/policyd.sysconfig	Mon Jan  3 14:25:36 2011
@@ -1,5 +1,5 @@
-# Path to policyd.conf
-POLICYD_CONF="/etc/policyd/policyd.conf"
-
 # Nice level for policyd
 SERVICE_RUN_NICE_LEVEL="+0"
+
+# config cbpolicyd is started
+#CLUEBRINGER_CONF="/etc/policyd/cluebringer.conf"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/policyd/policyd.init?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/policyd/policyd.sysconfig?r1=1.4&r2=1.5&f=u