diff options
| author | Balbir Singh <balbir@linux.vnet.ibm.com> | 2009-04-21 14:27:28 +0530 |
|---|---|---|
| committer | Balbir Singh <balbir@linux.vnet.ibm.com> | 2009-04-21 14:27:28 +0530 |
| commit | 01b53987d3587d026fcfc0f0486fed24e8737feb (patch) | |
| tree | 86d8e01ec2dad15500e52fae15d26b19c086710a /scripts | |
| parent | d47ac40b87f246f2f1badbf25d8e814614296051 (diff) | |
| parent | 8d8a747b161508ebfd48a6dac52f1438e2714a2b (diff) | |
| download | libcg-01b53987d3587d026fcfc0f0486fed24e8737feb.tar.gz libcg-01b53987d3587d026fcfc0f0486fed24e8737feb.tar.xz libcg-01b53987d3587d026fcfc0f0486fed24e8737feb.zip | |
Merge branch 'master' of ssh://balbir_singh@libcg.git.sourceforge.net/gitroot/libcg
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/init.d/cgconfig | 14 | ||||
| -rw-r--r-- | scripts/init.d/cgred | 11 |
2 files changed, 20 insertions, 5 deletions
diff --git a/scripts/init.d/cgconfig b/scripts/init.d/cgconfig index 6e6bcd6..6b01d9c 100644 --- a/scripts/init.d/cgconfig +++ b/scripts/init.d/cgconfig @@ -69,6 +69,7 @@ umount_fs() { } start() { + echo -n "Starting cgconfig service: " if [ -f /var/lock/subsys/$servicename ] then log_warning_msg "lock file already exists" @@ -77,11 +78,11 @@ start() { if [ $? -eq 0 ] then - #log_progress_msg "Starting cgconfig service: " cgconfigparser -l $CONFIG_FILE retval=$? if [ $retval -ne 0 ] then + log_failure_msg "Failed to parse " $CONFIG_FILE return $retval fi fi @@ -136,7 +137,14 @@ start() { done touch /var/lock/subsys/$servicename - return $? + retval=$? + if [ $retval -ne 0 ] + then + log_failure_msg "Failed to touch " /var/lock/subsys/$servicename + return $retval + fi + log_success_msg + return 0 } move_all_to_init_class() { @@ -169,9 +177,11 @@ move_all_to_init_class() { stop() { + echo -n "Stopping cgconfig service: " move_all_to_init_class umount_fs rm -f /var/lock/subsys/$servicename + log_success_msg } trapped() { diff --git a/scripts/init.d/cgred b/scripts/init.d/cgred index 73ca480..fa824df 100644 --- a/scripts/init.d/cgred +++ b/scripts/init.d/cgred @@ -67,7 +67,7 @@ start() { echo $"Starting CGroup Rules Engine Daemon..." if [ -f "/var/lock/subsys/$servicename" ] ; then - echo "$servicename is already running with PID `cat ${pidfile}`" + log_failure_msg "$servicename is already running with PID `cat ${pidfile}`" return 1 fi daemon --check $servicename --pidfile $pidfile $processname $OPTIONS @@ -87,6 +87,7 @@ stop() rm -f /var/lock/subsys/$servicename rm -f $pidfile fi + log_success_msg } # See how we are called @@ -116,9 +117,13 @@ case "$1" in echo $"Reloading rules configuration..." kill -s 12 `cat ${pidfile}` RETVAL=$? - echo + if [ $RETVAL -eq 0 ] ; then + log_success_msg + else + log_failure_msg + fi else - echo $"$servicename is not running." + log_failure_msg "$servicename is not running." fi ;; *) |