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 <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
russellb · Dec 12, 2014 · 2e60142 · 2e60142
1 parent 3a11fd5
commit 2e60142
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -72,6 +72,7 @@ Ian Campbell            [email protected]
 Isaku Yamahata          [email protected]
 James P.                [email protected]
 James Page              [email protected]
+Jan Vansteenkiste       [email protected]
 Jarno Rajahalme         [email protected]
 Jason Kölker            [email protected]
 Jasper Capel            [email protected]

diff --git 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}
 }