remove $proj-dist.conf for centos

[openstack-build/neutron-build.git] / rpm / SOURCES / neutron-ovs-cleanup.init

diff --git a/rpm/SOURCES/neutron-ovs-cleanup.init b/rpm/SOURCES/neutron-ovs-cleanup.init
index 970e9476e4a7582bbac9c88441d6a2818af2848b..7d9bd8060bec9412f1843e1c785907e5a534a2db 100644 (file)
--- a/rpm/SOURCES/neutron-ovs-cleanup.init
+++ b/rpm/SOURCES/neutron-ovs-cleanup.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # neutron-ovs-cleanup  OpenStack Open vSwitch cleanup utility
 #
@@ -12,7 +12,11 @@ proj=neutron
 prog=$proj-ovs-cleanup
 exec="/usr/bin/$prog"
 pidfile="/var/run/$proj/$prog.pid"
-config="/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini"
+configs=(
+    "/etc/$proj/$proj.conf" \
+    "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \
+)
+configs_str=${configs[@]/#/--config-file }
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -20,8 +24,10 @@ lockfile=/var/lock/subsys/$prog
 
 start() {
     [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    daemon --user neutron $exec --log-file /var/log/$proj/ovs-cleanup.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null
+    for config in ${configs[@]}; do
+        [ -f $config ] || exit 6
+    done
+    runuser -s /bin/bash neutron -c "$exec --log-file /var/log/$proj/ovs-cleanup.log $configs_str &>/dev/null"
     retval=$?
     [ $retval -eq 0 ] && touch $lockfile
     return $retval