tgt: prevent service from being started multiple times

Using the /etc/init.d/tgtd script, allows the service be started
multiple times, but only the last instance can be stopped using
the script.  This fix ensures that the service isn't running
before attempting to start the service multiple times.

Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/meta-openstack/recipes-support/tgt/files/tgtd.init b/meta-openstack/recipes-support/tgt/files/tgtd.init
index 8c07926..52d98c3 100644
--- a/meta-openstack/recipes-support/tgt/files/tgtd.init
+++ b/meta-openstack/recipes-support/tgt/files/tgtd.init
@@ -17,6 +17,15 @@ TGTD_CONFIG=/etc/tgt/targets.conf
 start ()
 {
     echo -n "Starting $DESC..."
+
+    # Ensure service isn't running
+    tgt-admin -s >/dev/null 2>&1
+    RETVAL=$?
+    if [ "$RETVAL" -ne 107 ] ; then
+        echo "$DESC is already running."
+        exit 1
+    fi
+
     # Start tgtd first
     $DAEMON &>/dev/null
     RETVAL=$?