Fixed linuxbridge init script.

Change-Id: Ia46155d2e5f5c739f06b0d1241fcb446599c0391

Rewritten-From: fd63ba33363aaf0018d793850a6ff1494a3af34d

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 7541b04ceb939470fc022db7ab550cb076fa4dbb..7233f613f2cc4fcc40f558800f83e33101c969fa 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2014.1-4) unstable; urgency=medium
+
+  * Fixed linuxbridge init script.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 21 May 2014 08:37:03 +0800
+
 neutron (2014.1-3) unstable; urgency=medium
 
   * Added Russian Debconf translation, thanks to Yuri Kozlov

diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.init b/trusty/debian/neutron-plugin-linuxbridge-agent.init
index e330521efeab44b770e4d81b7619200a834af98b..b08ed895a4ab1feb41cf47c14eebd0767b44e283 100644 (file)
--- a/trusty/debian/neutron-plugin-linuxbridge-agent.init
+++ b/trusty/debian/neutron-plugin-linuxbridge-agent.init
@@ -18,9 +18,10 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Openstack Neutron LinuxBridge Plugin Agent"
 NAME=neutron-linuxbridge-agent
 DAEMON=/usr/bin/neutron-linuxbridge-agent
+DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --log-file=/var/log/neutron/linuxbridge-agent.log"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
-CONF_FILE=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
+CONF_FILE="/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini"
 
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
@@ -35,7 +36,7 @@ do_start()
        start-stop-daemon --start --background --quiet --chuid neutron:neutron --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
                || return 1
        start-stop-daemon --start --background --quiet --chuid neutron:neutron --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
-               $CONF_FILE \
+               $DAEMON_ARGS \
                || return 2
 }