Author: baggins
Date: Sun Aug 14 00:34:49 2005
New Revision: 6305

Modified:
   rc-scripts/trunk/rc.d/init.d/functions
Log:
- take CPUSETS setting into account


Modified: rc-scripts/trunk/rc.d/init.d/functions
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/functions      (original)
+++ rc-scripts/trunk/rc.d/init.d/functions      Sun Aug 14 00:34:49 2005
@@ -498,7 +498,7 @@
        # And start it up.
        busy
        cd /
-       [ -n "$SERVICE_CPUSET" ] && echo $$ >/dev/cpuset/${SERVICE_CPUSET}/tasks
+       is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ] && echo $$ 
>/dev/cpuset/${SERVICE_CPUSET}/tasks
        if errors=$(umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK}; USER=root 
HOME=/tmp TMPDIR=/tmp nice -n 
${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} initlog -c "$prog" 
2>&1); then
                if [ -n "$waitname" -a -n "$waittime" ]; then
                        # Save basename.
@@ -690,7 +690,7 @@
 
        if [ "$pid" != "" ]; then
                cpuset_msg="..."
-               if [ -n "$SERVICE_CPUSET" ]; then
+               if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then
                        if $(grep -q "$pid" 
/dev/cpuset/${SERVICE_CPUSET}/tasks); then
                                cpuset_msg=$(nls " in cpuset %s..." 
"$SERVICE_CPUSET")
                        else
@@ -706,7 +706,7 @@
 #                        ((prog ":") == $5)) { print $1 ; exit 0 } }' $1`
 #              if [ "$pid" != "" ]; then
 #                      cpuset_msg="..."
-#                      if [ -n "$SERVICE_CPUSET" ]; then
+#                      if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then
 #                              if $(grep -q "$pid" 
/dev/cpuset/${SERVICE_CPUSET}/tasks); then
 #                                      cpuset_msg=$(nls " in cpuset %s..." 
"$SERVICE_CPUSET")
 #                              else
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to