summaryrefslogtreecommitdiffstats
path: root/source/a/libcgroup/libcgroup.init.diff
blob: 754912959c149398bd200340ba83b59087248496 (about) (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
--- ./scripts/init.d/cgred.in.orig	2011-03-03 02:29:41.000000000 -0600
+++ ./scripts/init.d/cgred.in	2011-03-03 14:23:03.000000000 -0600
@@ -39,9 +39,8 @@
 # Sanity checks
 [ -x $CGRED_BIN ] || exit 1
 
-# Source function library & LSB routines
+# Source function library
 . /etc/rc.d/init.d/functions
-. /lib/lsb/init-functions
 
 # Read in configuration options.
 if [ -f "/etc/sysconfig/cgred.conf" ] ; then
@@ -70,16 +69,16 @@
 {
 	echo -n $"Starting CGroup Rules Engine Daemon: "
 	if [ -f "$lockfile" ]; then
-		log_failure_msg "$servicename is already running with PID `cat ${pidfile}`"
+		echo "$servicename is already running with PID `cat ${pidfile}`"
 		return 0
 	fi
 	if [ ! -s $CGRED_CONF ]; then
-		log_failure_msg "not configured"
+		echo "not configured"
 		return 6
 	fi
 	if ! grep "^cgroup" /proc/mounts &>/dev/null; then
 		echo
-		log_failure_msg $"Cannot find cgroups, is cgconfig service running?"
+		echo $"Cannot find cgroups, is cgconfig service running?"
 		return 1
 	fi
 	daemon --check $servicename --pidfile $pidfile $CGRED_BIN $OPTIONS
@@ -100,7 +99,7 @@
 {
 	echo -n $"Stopping CGroup Rules Engine Daemon..."
 	if [ ! -f $pidfile ]; then
-		log_success_msg
+		#log_success_msg
 		return 0
 	fi
 	killproc -p $pidfile -TERM "$processname"
@@ -146,13 +145,13 @@
 			echo $"Reloading rules configuration..."
 			kill -s 12 `cat ${pidfile}`
 			RETVAL=$?
-			if [ $RETVAL -eq 0 ] ; then
-				log_success_msg
-			else
-				log_failure_msg
-			fi
+			#if [ $RETVAL -eq 0 ] ; then
+			#	log_success_msg
+			#else
+			#	log_failure_msg
+			#fi
 		else
-			log_failure_msg "$servicename is not running."
+			echo "$servicename is not running."
 		fi
 		;;
 	*)
--- ./scripts/init.d/cgconfig.in.orig	2011-03-03 02:29:41.000000000 -0600
+++ ./scripts/init.d/cgconfig.in	2011-03-03 14:21:27.000000000 -0600
@@ -36,11 +36,6 @@
 servicename=cgconfig
 lockfile=/var/lock/subsys/$servicename
 
-#
-# Source LSB routines
-#
-. /lib/lsb/init-functions
-
 # read the config
 CREATE_DEFAULT=yes
 if [ -e /etc/sysconfig/cgconfig ]; then
@@ -54,8 +49,8 @@
 	    grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf | \
 		    read user ctrl defaultcgroup
             if [ -n "$defaultcgroup" -a "$defaultcgroup" = "*" ]; then
-                log_warning_msg "/etc/cgrules.conf incorrect"
-                log_warning_msg "Overriding it"
+                echo "/etc/cgrules.conf incorrect"
+                echo "Overriding it"
                 defaultcgroup=
             fi
         fi
@@ -98,20 +93,20 @@
 start() {
         echo -n "Starting cgconfig service: "
 	if [ -f "$lockfile" ]; then
-            log_warning_msg "lock file already exists"
+            echo "lock file already exists"
             return 0
         fi
 
         if [ $? -eq 0 ]; then
                 if [ ! -s $CONFIG_FILE ]; then
-                    log_failure_msg $CONFIG_FILE "is not configured"
+                    echo $CONFIG_FILE "is not configured"
                     return 6
                 fi
 
                 $CGCONFIGPARSER_BIN -l $CONFIG_FILE
                 retval=$?
                 if [ $retval -ne 0 ]; then
-                    log_failure_msg "Failed to parse " $CONFIG_FILE
+                    echo "Failed to parse " $CONFIG_FILE
                     return 1
                 fi
         fi
@@ -123,10 +118,10 @@
         touch "$lockfile"
         retval=$?
         if [ $retval -ne 0 ]; then
-            log_failure_msg "Failed to touch $lockfile"
+            echo "Failed to touch $lockfile"
             return 1
         fi
-        log_success_msg
+        #log_success_msg
         return 0
 }
 
@@ -134,7 +129,7 @@
     echo -n "Stopping cgconfig service: "
     cgclear
     rm -f "$lockfile"
-    log_success_msg
+    #log_success_msg
     return 0
 }