From 24b5e4b2fa276e71765bbe36cd1e8714241617b4 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 29 Feb 2008 15:00:40 +0000 Subject: [PATCH] Really fix the warning on the init script git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@633 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server-2.0/etc/init.d/xcatd | 2 +- xCAT-server-2.0/xcatd.rc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xCAT-server-2.0/etc/init.d/xcatd b/xCAT-server-2.0/etc/init.d/xcatd index a41fbfbea..cf8995e7a 100755 --- a/xCAT-server-2.0/etc/init.d/xcatd +++ b/xCAT-server-2.0/etc/init.d/xcatd @@ -35,7 +35,7 @@ if [ -f /lib/lsb/init-functions ]; then STATUS=MStatus LOG_SUCCESS=log_success_msg LOG_FAILURE=log_failure_msg - LOG_WARNING=log_warning_message + LOG_WARNING=log_warning_msg elif [ -f /etc/init.d/functions ]; then echo RH . /etc/init.d/functions diff --git a/xCAT-server-2.0/xcatd.rc b/xCAT-server-2.0/xcatd.rc index 67b8467e7..8b895bfb8 100755 --- a/xCAT-server-2.0/xcatd.rc +++ b/xCAT-server-2.0/xcatd.rc @@ -32,7 +32,8 @@ if [ -f /lib/lsb/init-functions ]; then STATUS=MStatus LOG_SUCCESS=log_success_msg LOG_FAILURE=log_failure_msg - LOG_WARNING=log_warning_message + #LOG_WARNING=log_warning_message + LOG_WARNING=passed elif [ -f /etc/init.d/functions ]; then echo RH . /etc/init.d/functions @@ -59,7 +60,7 @@ stop) $STATUS >& /dev/null if [ "$?" != "0" ]; then echo -n "xCATd not running, not stopping " - #$LOG_WARNING + $LOG_WARNING exit 1 fi kill -TERM -`cat /var/run/xcatd.pid`