From 6cb41ee27babbb6c7196532b42d12c1daaf4b7b8 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Thu, 4 Jun 2015 14:25:39 -0400 Subject: [PATCH] Clean up some formatting issues with xcatd init.d script. --- xCAT-server/etc/init.d/xcatd | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xCAT-server/etc/init.d/xcatd b/xCAT-server/etc/init.d/xcatd index 493582c2c..f7d7b7b0e 100755 --- a/xCAT-server/etc/init.d/xcatd +++ b/xCAT-server/etc/init.d/xcatd @@ -83,11 +83,11 @@ restart) ;; reload) echo -n "Reloading xCATd " - if [ -r /etc/profile.d/xcat.sh ]; then + if [ -r /etc/profile.d/xcat.sh ]; then . /etc/profile.d/xcat.sh fi export XCATRELOAD=yes - xcatd -p /var/run/xcatd.pid && $LOG_SUCCESS || $LOG_FAILURE + xcatd -p /var/run/xcatd.pid && $LOG_SUCCESS || $LOG_FAILURE ;; status) $STATUS @@ -98,6 +98,7 @@ stop) if [ "$?" != "0" ]; then echo -n "xCATd not running, not stopping " $LOG_WARNING + echo exit 0 fi kill -TERM -`cat /var/run/xcatd.pid` @@ -116,14 +117,15 @@ stop) $LOG_FAILURE exit 0 fi - $LOG_SUCCESS rm /var/run/xcatd.pid + $LOG_SUCCESS ;; start) $STATUS > /dev/null 2>&1 if [ "$?" = "0" ]; then echo -n "xCATd already running " $LOG_WARNING + echo exit fi echo -n "Starting xCATd "