- take CPUSETS setting into account

svn-id: @6305

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 931140d66ebd1f487e236ca614d831f9c2152c7b..034b40e6f711f0ca19c5cfc5f14a669e7d0f821c 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -498,7 +498,7 @@ daemon()
        # 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 @@ status()
 
        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 @@ status()
 #                        ((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