Enable Open vSwitch (OVS) support

This includes a drop-in config for NetworkManager.service which changes
its ordering. So ship the plugin in a separate package named
network-manager-ovs.

Closes: #1127478

4 files changed, 16 insertions, 2 deletions

diff --git a/debian/control b/debian/control
index a6854c0b..ca902d13 100644
--- a/debian/control
+++ b/debian/control
@@ -83,6 +83,14 @@ Description: network management framework (daemon and userspace tools)
     teamed together and act like a single one. This process is called "ethernet
     bonding", "channel teaming" or "link aggregation".
 
+Package: network-manager-ovs
+Architecture: linux-any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libnm0 (= ${binary:Version}),
+Description: Open vSwitch (OVS) support for NetworkManager
+ This package adds Open vSwitch support.
+
 Package: network-manager-dev
 Section: devel
 Architecture: all
diff --git a/debian/network-manager-ovs.install b/debian/network-manager-ovs.install
new file mode 100644
index 00000000..833db026
--- /dev/null
+++ b/debian/network-manager-ovs.install
@@ -0,0 +1,2 @@
+usr/lib/*/NetworkManager/*/libnm-device-plugin-ovs.so
+usr/lib/systemd/system/NetworkManager.service.d/NetworkManager-ovs.conf
diff --git a/debian/network-manager.install b/debian/network-manager.install
index 69d38c54..3b34a0af 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -5,7 +5,11 @@ usr/bin/nmtui*
 usr/libexec/
 usr/lib/NetworkManager/
 usr/lib/*/NetworkManager/*/libnm-settings-plugin-ifupdown.so
-usr/lib/*/NetworkManager/*/libnm-device-plugin-*.so
+usr/lib/*/NetworkManager/*/libnm-device-plugin-adsl.so
+usr/lib/*/NetworkManager/*/libnm-device-plugin-bluetooth.so
+usr/lib/*/NetworkManager/*/libnm-device-plugin-team.so
+usr/lib/*/NetworkManager/*/libnm-device-plugin-wifi.so
+usr/lib/*/NetworkManager/*/libnm-device-plugin-wwan.so
 usr/lib/*/NetworkManager/*/libnm-ppp-plugin.so
 usr/lib/*/NetworkManager/*/libnm-wwan.so
 usr/lib/pppd/*/*.so
diff --git a/debian/rules b/debian/rules
index 9d7a7782..fbaf8b7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ override_dh_auto_configure:
 		-Difcfg_rh=false \
 		-Dnm_cloud_setup=false \
 		-Dmodify_system=false \
-		-Dovs=false \
+		-Dovs=true \
 		-Dqt=false \
 		-Debpf=false \
 		-Dnbft=false \