X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2Fneutron-dhcp-agent.init;h=f7268aa826f5c511c5bd036344932631077d384c;hb=refs%2Fheads%2Fopenstack-ci%2Fbuild%2Fhavana;hp=e7ebd96e552752ca293ee48489531dc596dbea4a;hpb=41c661dde15aa2524a423ced2815671886af8f36;p=openstack-build%2Fneutron-build.git

diff --git a/rpm/SOURCES/neutron-dhcp-agent.init b/rpm/SOURCES/neutron-dhcp-agent.init
index e7ebd96e5..f7268aa82 100644
--- a/rpm/SOURCES/neutron-dhcp-agent.init
+++ b/rpm/SOURCES/neutron-dhcp-agent.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # neutron-dhcp-agent  OpenStack Neutron DHCP Agent
 #
@@ -12,8 +12,12 @@ proj=neutron
 plugin=dhcp-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
-config="/etc/$proj/dhcp_agent.ini"
+configs=(
+    "/etc/$proj/$proj.conf" \
+    "/etc/$proj/dhcp_agent.ini" \
+)
 pidfile="/var/run/$proj/$prog.pid"
+logfile="/var/log/$proj/dhcp-agent.log"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog
 
 start() {
     [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
+    for config in ${configs[@]}; do
+        [ -f $config ] || exit 6
+    done
     echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile"
+    daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile