From 8091d037e54fe58ddfdd67cdfd7d93f4689f02dc Mon Sep 17 00:00:00 2001 From: Jan Vansteenkiste Date: Mon, 8 Dec 2014 14:52:07 +0100 Subject: [PATCH] debian: Use ifquery for finding the interfaces in init script. When using interfaces.d/, interfaces are not picked up. Let ifquery figure out the format of the interfaces files for us. Signed-off-by: Jan Vansteenkiste Signed-off-by: Ben Pfaff --- AUTHORS | 1 + debian/openvswitch-switch.init | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index d6770ad9e..8db40267a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -61,6 +61,7 @@ Ian Campbell Ian.Campbell@citrix.com Isaku Yamahata yamahata@valinux.co.jp James P. roampune@gmail.com James Page james.page@ubuntu.com +Jan Vansteenkiste jan@vstone.eu Jarno Rajahalme jrajahalme@nicira.com Jason Kölker jason@koelker.net Jasper Capel jasper@capel.tv diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init index bf84477ec..8e156dad0 100755 --- a/debian/openvswitch-switch.init +++ b/debian/openvswitch-switch.init @@ -33,7 +33,7 @@ test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch network_interfaces () { INTERFACES="/etc/network/interfaces" [ -e "${INTERFACES}" ] || return - bridges=`awk '{ if ($1 == "allow-ovs") { print $2; } }' "${INTERFACES}"` + bridges=`ifquery --allow ovs --list` [ -n "${bridges}" ] && $1 --allow=ovs ${bridges} } -- 2.20.1