Code Review
/
openstack-build
/
neutron-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Deleted backported patch 0007 from spec for RPM.
[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..0694022a504fbf322bcb432535e873ebeaf874bd 100644
(file)
--- a/
rpm/SOURCES/neutron-ovs-cleanup.init
+++ b/
rpm/SOURCES/neutron-ovs-cleanup.init
@@
-1,4
+1,4
@@
-#!/bin/sh
+#!/bin/
ba
sh
#
# neutron-ovs-cleanup OpenStack Open vSwitch cleanup utility
#
#
# neutron-ovs-cleanup OpenStack Open vSwitch cleanup utility
#
@@
-12,7
+12,12
@@
proj=neutron
prog=$proj-ovs-cleanup
exec="/usr/bin/$prog"
pidfile="/var/run/$proj/$prog.pid"
prog=$proj-ovs-cleanup
exec="/usr/bin/$prog"
pidfile="/var/run/$proj/$prog.pid"
-config="/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini"
+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
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@
-20,8
+25,10
@@
lockfile=/var/lock/subsys/$prog
start() {
[ -x $exec ] || exit 5
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
retval=$?
[ $retval -eq 0 ] && touch $lockfile
return $retval