X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2Fneutron-dhcp-agent.init;h=ef93ac2f59a9b44ab9ccb43976f37296f572703d;hb=2c9341a103d67f180aeb1c0e1f2b3f094e4a4696;hp=f7268aa826f5c511c5bd036344932631077d384c;hpb=230e607edf3ad1725b80f9ec05d8b661f96c4b10;p=openstack-build%2Fneutron-build.git

diff --git a/rpm/SOURCES/neutron-dhcp-agent.init b/rpm/SOURCES/neutron-dhcp-agent.init
index f7268aa82..ef93ac2f5 100644
--- a/rpm/SOURCES/neutron-dhcp-agent.init
+++ b/rpm/SOURCES/neutron-dhcp-agent.init
@@ -13,11 +13,11 @@ plugin=dhcp-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
+    "/usr/share/$proj/$proj-dist.conf" \
     "/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
 
@@ -29,7 +29,7 @@ start() {
         [ -f $config ] || exit 6
     done
     echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+    daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile