diff options
| author | Jan Vansteenkiste <jan@vstone.eu> | 2014-12-08 14:52:07 +0100 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-12-11 17:36:24 -0800 |
| commit | 2e601425c6075b05cde37a1b9c64cc29f4791f16 (patch) | |
| tree | 9f3494848b980a0fc1e4078795ea6fb825568add | |
| parent | 3a11fd5b2b0fc2511e0fbef465c6ff50b121e519 (diff) | |
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>
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rwxr-xr-x | debian/openvswitch-switch.init | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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 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} } |