From 06ef46415cd7fbd96397b76dc34dfcff0772c2f5 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Wed, 29 Jul 2015 17:20:43 +0000
Subject: [PATCH] /etc/init.d/scst: Suppress an error message if iscsi-scstd is
 not installed

Avoid that the following error message is printed when stopping
or starting SCST if iscsi-scstd has not been installed:

# /sbin/service scst restart
which: no iscsi-scstd in
(/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin)
Restarting SCST

Signed-off-by: Hiroyuki Sato <hiroysato@gmail.com>
[bvanassche: Eliminated ISCSI_DAEMON variable]


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6436 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/init.d/scst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scstadmin/init.d/scst b/scstadmin/init.d/scst
index 6c45745b8..ba5ce6f19 100755
--- a/scstadmin/init.d/scst
+++ b/scstadmin/init.d/scst
@@ -79,7 +79,6 @@ fi
 cat <<"EOF"
 
 SCST_CFG=/etc/scst.conf
-ISCSI_DAEMON="$(which iscsi-scstd)"
 
 show_status() {
   _rc_status_ret=$?
@@ -160,7 +159,7 @@ parse_scst_conf() {
                 SCST_OPT_MODULES="crc32c-intel $SCST_OPT_MODULES";;
         esac
         SCST_OPT_MODULES="crc32c isert_scst $SCST_OPT_MODULES"
-        SCST_DAEMONS="${ISCSI_DAEMON} $SCST_DAEMONS"
+        SCST_DAEMONS="$(which iscsi-scstd) $SCST_DAEMONS"
     fi
 }