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 8978cac4af1ff3040edea2e3d3b2caa48d7ef23c..7d9bd8060bec9412f1843e1c785907e5a534a2db 100644 (file)
--- a/rpm/SOURCES/neutron-ovs-cleanup.init
+++ b/rpm/SOURCES/neutron-ovs-cleanup.init
@@ -13,10 +13,10 @@ prog=$proj-ovs-cleanup
 exec="/usr/bin/$prog"
 pidfile="/var/run/$proj/$prog.pid"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \
 )
+configs_str=${configs[@]/#/--config-file }
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -27,7 +27,7 @@ start() {
     for config in ${configs[@]}; do
         [ -f $config ] || exit 6
     done
-    daemon --user neutron $exec --log-file /var/log/$proj/ovs-cleanup.log ${configs[@]/#/--config-file } &>/dev/null
+    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