From ebd2235ca01ebdb54c698120c925b609a094e017 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 21 May 2014 08:39:01 +0800 Subject: [PATCH] Fixed linuxbridge init script. Change-Id: Ia46155d2e5f5c739f06b0d1241fcb446599c0391 Rewritten-From: fd63ba33363aaf0018d793850a6ff1494a3af34d --- trusty/debian/changelog | 6 ++++++ trusty/debian/neutron-plugin-linuxbridge-agent.init | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 7541b04ce..7233f613f 100644 --- 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 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 e330521ef..b08ed895a 100644 --- 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 } -- 2.45.2