packages: libcgroup/cgconfig.init - use local vars, use $(), add try-restar...

[glen]

Author: glen                         Date: Tue Feb  8 15:00:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use local vars, use $(), add try-restart, force-reload; drop condrestart

---- Files affected:
packages/libcgroup:
   cgconfig.init (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/libcgroup/cgconfig.init
diff -u packages/libcgroup/cgconfig.init:1.6 packages/libcgroup/cgconfig.init:1.7
--- packages/libcgroup/cgconfig.init:1.6	Tue Feb  8 15:55:38 2011
+++ packages/libcgroup/cgconfig.init	Tue Feb  8 16:00:11 2011
@@ -14,6 +14,7 @@
 [ -f /etc/sysconfig/cgconfig ] && . /etc/sysconfig/cgconfig
 
 create_default_groups() {
+	local defaultcgroup controllers
 	if [ -f /etc/cgrules.conf ]; then
 		defaultcgroup=$(awk '/^\*[\t ]+/ { print $3; exit }' /etc/cgrules.conf)
 		if [ -n "$defaultcgroup" -a "$defaultcgroup" = "*" ]; then
@@ -42,9 +43,10 @@
 	# special rule for cpusets
 	#
 	if echo $controllers | grep -q -w cpuset; then
-		cpus=`cgget -nv -r cpuset.cpus /`
+		local cpus mems
+		cpus=$(cgget -nv -r cpuset.cpus /)
 		cgset -r cpuset.cpus=$cpus $defaultcgroup
-		mems=`cgget -nv -r cpuset.mems /`
+		mems=$(cgget -nv -r cpuset.mems /)
 		cgset -r cpuset.mems=$mems $defaultcgroup
 	fi
 
@@ -52,7 +54,7 @@
 	# Classify everything to default cgroup. Ignore errors, some processes
 	# may exit after ps is run and before cgclassify moves them.
 	#
-	cgclassify -g $controllers:$defaultcgroup `ps --no-headers -eL o tid` 2>/dev/null || :
+	cgclassify -g $controllers:$defaultcgroup $(ps --no-headers -eL o tid) 2>/dev/null || :
 }
 
 start() {
@@ -63,11 +65,12 @@
 	fi
 	if [ ! -s /etc/cgconfig.conf ]; then
 		nls "/etc/cgconfig.conf is not configured"
-		return 6
+		RETVAL=6
+		return
 	fi
 	msg_starting "cgconfig"; busy
 	local out
-	out=`/sbin/cgconfigparser -l /etc/cgconfig.conf 2>&1`
+	out=$(/sbin/cgconfigparser -l /etc/cgconfig.conf 2>&1)
 	RETVAL=$?
 	if [ $RETVAL -ne 0 ]; then
 		fail
@@ -84,34 +87,45 @@
 }
 
 stop() {
-	if [ -f /var/lock/subsys/cgconfig ]; then
-		msg_stopping "cgconfig"
-		cgclear
-		rm -f /var/lock/subsys/cgconfig
-		ok
-	else
+	if [ ! -f /var/lock/subsys/cgconfig ]; then
 		msg_not_running "cgconfig"
+		return
 	fi
+
+	msg_stopping "cgconfig"
+	cgclear
+	rm -f /var/lock/subsys/cgconfig
+	ok
 }
 
-RETVAL=0
+condrestart() {
+	if [ ! -f /var/lock/subsys/cgconfig ]; then
+		msg_not_running "cgconfig"
+		RETVAL=$1
+		return
+	fi
 
+	stop
+	start
+}
+
+RETVAL=0
 case "$1" in
   start)
 	start
 	;;
   stop)
-	stop;
+	stop
 	;;
-  restart|reload)
+  restart)
 	stop
 	start
 	;;
-  condrestart)
-	if [ -f /var/lock/subsys/cgconfig ] ; then
-		stop
-		start
-	fi
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
 	;;
   status)
 	if [ -f /var/lock/subsys/cgconfig ] ; then
@@ -123,7 +137,7 @@
 	fi
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|condrestart|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 	;;
 esac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcgroup/cgconfig.init?r1=1.6&r2=1.7&f=u