debian: Use ifquery for finding the interfaces in init script.

When using interfaces.d/<foobar>, interfaces are not picked up.
Let ifquery figure out the format of the interfaces files for us.

Signed-off-by: Jan Vansteenkiste <jan@vstone.eu>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/AUTHORS b/AUTHORS
index 2fb0946..aa445be 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -72,6 +72,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 bf84477..8e156da 100755 (executable)
--- 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}
 }