From bbd42c7888fe7500bae0b01c03bff5bb8e314bf4 Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Tue, 22 Dec 2009 09:23:42 +0100
Subject: Move sysdefault handling to separate function

Move sysdefault handling to separate function - it simplifies following
patch.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
---
 scripts/init.d/cgconfig.in | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/scripts/init.d/cgconfig.in b/scripts/init.d/cgconfig.in
index 543cb9f..13c16f8 100644
--- a/scripts/init.d/cgconfig.in
+++ b/scripts/init.d/cgconfig.in
@@ -70,25 +70,7 @@ umount_fs() {
         done
 }
 
-start() {
-        echo -n "Starting cgconfig service: "
-	if [ -f /var/lock/subsys/$servicename ]
-        then
-            log_warning_msg "lock file already exists"
-            return
-        fi
-
-        if [ $? -eq 0 ]
-        then
-                $CGCONFIGPARSER_BIN -l $CONFIG_FILE
-                retval=$?
-                if [ $retval -ne 0 ]
-                then
-                    log_failure_msg "Failed to parse " $CONFIG_FILE
-                    return $retval
-                fi
-        fi
-
+create_default_groups() {
         declare defaultcgroup
 
         if [ -f /etc/cgrules.conf ]
@@ -137,7 +119,29 @@ start() {
                 echo $j > ${MOUNTPOINT[$i]}/$defaultcgroup/tasks 2>/dev/null
             done
         done
-	
+}
+
+start() {
+        echo -n "Starting cgconfig service: "
+	if [ -f /var/lock/subsys/$servicename ]
+        then
+            log_warning_msg "lock file already exists"
+            return
+        fi
+
+        if [ $? -eq 0 ]
+        then
+                $CGCONFIGPARSER_BIN -l $CONFIG_FILE
+                retval=$?
+                if [ $retval -ne 0 ]
+                then
+                    log_failure_msg "Failed to parse " $CONFIG_FILE
+                    return $retval
+                fi
+        fi
+
+	create_default_groups
+
         touch /var/lock/subsys/$servicename
         retval=$?
         if [ $retval -ne 0 ]
-- 
cgit