Skip to content

Commit

Permalink
debian: Use ifquery for finding the interfaces in init script.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
vStone authored and blp committed Dec 12, 2014
1 parent 3a11fd5 commit 2e60142
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion debian/openvswitch-switch.init
Expand Up @@ -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}
}

Expand Down

0 comments on commit 2e60142

Please sign in to comment.