ovs-ctl: Do not load brcompat_mod if the bridge module is already loaded.

brcompat_mod and the Linux bridge module are incompatible, so it doesn't
make sense to try to load both at the same time.  This commit prevents
ovs-ctl from trying.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Reported-by: Rogério Vinhal Nunes
Launchpad bug #917309.

diff --git a/AUTHORS b/AUTHORS
index 87b3ccdf781f0e744da9ecf595120299019067af..328218de131978371022a78c43b7e736383d7461 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -114,6 +114,7 @@ Peter Phaal             peter.phaal@inmon.com
 Ram Jothikumar          rjothikumar@nicira.com
 Ramana Reddy            gtvrreddy@gmail.com
 Roger Leigh             rleigh@codelibre.net
+Rogério Vinhal Nunes
 Sean Brady              sbrady@gtfservices.com
 Sebastian Andrzej Siewior  sebastian@breakpoint.cc
 Sébastien RICCIO        sr@swisscenter.com

diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 5640ee88d6c0b86db8f387549dddd8c770a35637..d1df6a8491f6ca81bebe653529cde71ab056a43a 100755 (executable)
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -52,6 +52,10 @@ insert_openvswitch_mod_if_required () {
 }
 
 insert_brcompat_mod_if_required () {
+    if test -e /sys/module/bridge; then
+        log_warning_msg "bridge module is loaded, not loading brcompat_mod"
+        return 1
+    fi
     test -e /sys/module/brcompat_mod && return 0
     action "Inserting brcompat module" modprobe brcompat_mod
 }