Author: baggins Date: Mon Feb 7 23:46:47 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- formating
- use our functions
---- Files affected:
packages/libcgroup:
cgconfig.init (1.1 -> 1.2) , cgred.init (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/libcgroup/cgconfig.init
diff -u packages/libcgroup/cgconfig.init:1.1
packages/libcgroup/cgconfig.init:1.2
--- packages/libcgroup/cgconfig.init:1.1 Tue Feb 8 00:34:31 2011
+++ packages/libcgroup/cgconfig.init Tue Feb 8 00:46:41 2011
@@ -14,13 +14,11 @@
[ -f /etc/sysconfig/cgconfig ] && . /etc/sysconfig/cgconfig
create_default_groups() {
- local defaultcgroup
-
- if [ -f /etc/cgrules.conf ]; then
+ if [ -f /etc/cgrules.conf ]; then
defaultcgroup=$(awk '/^\*[\t ]+/ { print $3; exit }'
/etc/cgrules.conf)
if [ -n "$defaultcgroup" -a "$defaultcgroup" = "*" ]; then
- log_warning_msg "/etc/cgrules.conf incorrect"
- log_warning_msg "Overriding it"
+ nls "/etc/cgrules.conf incorrect"
+ nls "Overriding it"
defaultcgroup=
fi
fi
@@ -29,33 +27,33 @@
defaultcgroup=sysdefault/
fi
- #
- # Find all mounted subsystems and create comma-separated list
- # of controllers.
- #
- controllers=`lssubsys 2>/dev/null | tr '\n' ',' | sed s/.$//`
-
- #
- # Create the default group, ignore errors when the default group
- # already exists.
- #
- cgcreate -f 664 -d 775 -g $controllers:$defaultcgroup 2>/dev/null
-
- #
- # special rule for cpusets
- #
- if echo $controllers | grep -q -w cpuset; then
- cpus=`cgget -nv -r cpuset.cpus /`
- cgset -r cpuset.cpus=$cpus $defaultcgroup
- mems=`cgget -nv -r cpuset.mems /`
- cgset -r cpuset.mems=$mems $defaultcgroup
- fi
-
- #
- # 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 || :
+ #
+ # Find all mounted subsystems and create comma-separated list
+ # of controllers.
+ #
+ controllers=`lssubsys 2>/dev/null | tr '\n' ',' | sed s/.$//`
+
+ #
+ # Create the default group, ignore errors when the default group
+ # already exists.
+ #
+ cgcreate -f 664 -d 775 -g $controllers:$defaultcgroup 2>/dev/null
+
+ #
+ # special rule for cpusets
+ #
+ if echo $controllers | grep -q -w cpuset; then
+ cpus=`cgget -nv -r cpuset.cpus /`
+ cgset -r cpuset.cpus=$cpus $defaultcgroup
+ mems=`cgget -nv -r cpuset.mems /`
+ cgset -r cpuset.mems=$mems $defaultcgroup
+ fi
+
+ #
+ # 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 || :
}
start() {
@@ -67,27 +65,22 @@
msg_starting "cgconfig"
if [ ! -s /etc/cgconfig.conf ]; then
- log_failure_msg "/etc/cgconfig.conf is not configured"
+ nls "/etc/cgconfig.conf is not configured"
return 6
fi
/sbin/cgconfigparser -l /etc/cgconfig.conf
retval=$?
if [ $retval -ne 0 ]; then
- log_failure_msg "Failed to parse /etc/cgconfig.conf"
+ nls "Failed to parse /etc/cgconfig.conf"
return 1
fi
- if [ $CREATE_DEFAULT = "yes" ]; then
+ if is_yes "$CREATE_DEFAULT"; then
create_default_groups
fi
-
- touch /var/lock/subsys/cgconfig
retval=$?
- if [ $retval -ne 0 ]; then
- log_failure_msg "Failed to touch /var/lock/subsys/cgconfig"
- return 1
- fi
+ [ $retval -eq 0 ] && touch /var/lock/subsys/cgconfig
ok
}
================================================================
Index: packages/libcgroup/cgred.init
diff -u packages/libcgroup/cgred.init:1.1 packages/libcgroup/cgred.init:1.2
--- packages/libcgroup/cgred.init:1.1 Tue Feb 8 00:34:32 2011
+++ packages/libcgroup/cgred.init Tue Feb 8 00:46:41 2011
@@ -18,15 +18,15 @@
return
fi
- msg_staring "CGroup Rules Engine Daemon"
if [ ! -s /etc/cgrules.conf ]; then
- log_failure_msg "not configured"
+ nls "CGroup Rules Engine Daemon not configured"
return 6
fi
if ! grep -qs "^cgroup" /proc/mounts ; then
- log_failure_msg "Cannot find cgroups, is cgconfig service
running?"
+ nls "Cannot find cgroups, is cgconfig service running?"
return 1
fi
+ msg_staring "CGroup Rules Engine Daemon"
# Read in configuration options.
OPTIONS=""
if [ -f "/etc/sysconfig/cgred.conf" ] ; then
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcgroup/cgconfig.init?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcgroup/cgred.init?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
