From: Jan Safranek <jsafrane@redhat.com>
Date: Tue, 22 Dec 2009 08:24:52 +0000 (+0100)
Subject: Clean up the init script
X-Git-Tag: v0.35~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff056dae8a4218a9b6843046364c73528294ccc1;p=thirdparty%2Flibcgroup.git

Clean up the init script

Some parts of the init script are not needed with the recent changes.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
---

diff --git a/scripts/init.d/cgconfig.in b/scripts/init.d/cgconfig.in
index f61a0cd0..261c7d8c 100644
--- a/scripts/init.d/cgconfig.in
+++ b/scripts/init.d/cgconfig.in
@@ -32,8 +32,6 @@
 # get correct location of binaries from configure
 prefix=@prefix@;exec_prefix=@exec_prefix@;sbindir=@sbindir@
 CGCONFIGPARSER_BIN=$sbindir/cgconfigparser
-MOUNTS_FILE=/proc/mounts
-PROC_CGROUPS_FILE=/proc/cgroups
 CGROUP_FS=cgroup
 CONFIG_FILE=/etc/cgconfig.conf
 
@@ -54,20 +52,6 @@ if [ -e /etc/sysconfig/cgconfig ]; then
         . /etc/sysconfig/cgconfig
 fi
 
-parse_mounts() {
-    while read name mountpt fs opts other
-    do
-        if echo $name | grep -q $CGROUP_FS
-        then
-            maxindex=$(($maxindex+1))
-            MOUNTPOINT[$maxindex]=$mountpt
-            MOUNTOPTS[$maxindex]=$opts
-        fi
-    done < $MOUNTS_FILE
-
-    return 0;
-}
-
 create_default_groups() {
         declare defaultcgroup
 
@@ -179,8 +163,6 @@ common() {
     trap "trapped QUIT" QUIT
     trap "trapped TERM" TERM
     trap "trapped INT"   INT
-
-    parse_mounts
 }
 
 case $1 in