From fadc2be99443518aa0909e633238797d2d4b0190 Mon Sep 17 00:00:00 2001
From: Igor Yozhikov <iyozhikov@mirantis.com>
Date: Thu, 13 Feb 2014 19:36:14 +0400
Subject: [PATCH] Return setup scripts in the consistent state

Change-Id: I3708db662f9c25498a5fe7ec086994247cbfce33
---
 etc/init.d/murano-conductor-el6 | 98 ---------------------------------
 setup.sh                        |  7 ++-
 2 files changed, 4 insertions(+), 101 deletions(-)
 delete mode 100755 etc/init.d/murano-conductor-el6

diff --git a/etc/init.d/murano-conductor-el6 b/etc/init.d/murano-conductor-el6
deleted file mode 100755
index 92af6cd..0000000
--- a/etc/init.d/murano-conductor-el6
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-#    Copyright (c) 2013 Mirantis, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-#    Author: Igor Yozhikov <iyozhikov@mirantis.com>
-#
-### BEGIN INIT INFO
-# Provides: murano-conductor
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: OpenStack Murano Conductor Server
-# Description: This startup script launches murano-conductor service daemon.
-### END INIT INFO
-# chkconfig: 3 90 10
-# description: This startup script launches murano-conductor service daemon.
-# config: /etc/murano/murano-conductor.conf, /etc/murano/murano-conductor-paste.ini
-#
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
-DESC="murano-conductor"
-NAME=murano-conductor
-DAEMON=$(which muranoconductor)
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/openstack-$NAME
-SYSTEM_USER=root
-CONFIG_FILE=/etc/murano/murano-conductor.conf
-LOCKFILE=/var/lock/subsys/$NAME
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 5
-
-# source function library
-. /etc/init.d/functions
-
-RETVAL=0
-
-
-start() {
-    echo -n "Starting $NAME: "
-    daemon --user $SYSTEM_USER "$DAEMON --config-file=$CONFIG_FILE &>/dev/null & echo \$! > $PIDFILE"
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch $LOCKFILE
-    return $RETVAL
-}
-
-stop() {
-    echo -n "Stopping $NAME: "
-    #killproc $DAEMON -TERM
-    killproc -p $PIDFILE $DAEMON
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
-    return $RETVAL
-}
-
-restart() {
-    stop
-    start
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status $DAEMON
-}
-
-
-case "$1" in
-    start)
-        start
-        ;;
-
-    stop)
-        stop
-        ;;
-
-    restart)
-        restart
-        ;;
-
-    status)
-        rh_status
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart}"
-        exit 2
-esac
-exit $?
diff --git a/setup.sh b/setup.sh
index 2f25adf..7f2b9bf 100755
--- a/setup.sh
+++ b/setup.sh
@@ -125,11 +125,12 @@ function inject_init()
     retval=0
     _dist=$(lowercase $DISTRO_BASED_ON)
     eval src_init_sctipt="$DAEMON_NAME-$_dist"
-    _initscript="openstack-$DAEMON_NAME"
+    _initscript="$DAEMON_NAME"
     cp -f "$RUN_DIR/etc/init.d/$src_init_sctipt" "/etc/init.d/$_initscript" || retval=$?
     chmod +x "/etc/init.d/$_initscript" || retval=$?
     iniset '' 'SYSTEM_USER' "$DAEMON_USER" "/etc/init.d/$_initscript"
     iniset '' 'DAEMON' "$(shslash $SERVICE_EXEC_PATH)" "/etc/init.d/$_initscript"
+    iniset '' 'SCRIPTNAME' "$(shslash "/etc/init.d/$_initscript")" "/etc/init.d/$_initscript"
     case $_dist in
         "debian")
             update-rc.d $_initscript defaults || retval=$?
@@ -146,7 +147,7 @@ function purge_init()
 {
     retval=0
     _dist=$(lowercase $DISTRO_BASED_ON)
-    _initscript="openstack-$DAEMON_NAME"
+    _initscript="$DAEMON_NAME"
     service $_initscript stop
     if [ $? -ne 0 ]; then
         retval=1
@@ -231,7 +232,7 @@ function install_daemon()
     log "...found at \"$SERVICE_EXEC_PATH\""
     log "Installing SysV init script."
     inject_init || exit $?
-    log "Everything done, please, verify \"$DAEMON_CFG_DIR/$DAEMON_NAME.conf\", service created as \"openstack-${DAEMON_NAME}\"."
+    log "Everything done, please, verify \"$DAEMON_CFG_DIR/$DAEMON_NAME.conf\", service created as \"${DAEMON_NAME}\"."
 }
 function uninstall_daemon()
 {