debian: Enable passing extra options to ovs-ctl from init scripts.

This is useful for passing wrapper script options and possibly for other
purposes.

Bug #11889.
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index b44daad8a0d89c457f39cd355dc3028ff8481e1f..3c937205599bc00fbcca3195d73b8cbae07ef466 100755 (executable)
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -70,6 +70,7 @@ start () {
     if test X"$FORCE_COREFILES" != X; then
        set "$@" --force-corefiles="$FORCE_COREFILES"
     fi
+    set "$@" $OVS_CTL_OPTS
     "$@" || exit $?
 
     ovs_ctl --protocol=gre enable-protocol

diff --git a/debian/openvswitch-switch.template b/debian/openvswitch-switch.template
index 46816eaab149c903a1c33a2fb8a659fd8d51a69a..afa5dd30ae431822758fd656070f67121c9c395c 100644 (file)
--- a/debian/openvswitch-switch.template
+++ b/debian/openvswitch-switch.template
@@ -6,3 +6,7 @@
 # BRCOMPAT: If 'yes' and the openvswitch-brcompat package is installed, then
 # Linux bridge compatibility will be enabled.
 # BRCOMPAT=no
+
+# OVS_CTL_OPTS: Extra options to pass to ovs-ctl.  This is, for example,
+# a suitable place to specify --ovs-vswitchd-wrapper=valgrind.
+# OVS_CTL_OPTS=