From 258748613a8b53a571d93f58fbfda57f91b81b2b Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 16 Jan 2012 14:43:22 -0800 Subject: [PATCH] ovs-ctl: Do not load brcompat_mod if the bridge module is already loaded. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reported-by: Rogério Vinhal Nunes Launchpad bug #917309. --- AUTHORS | 1 + utilities/ovs-ctl.in | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/AUTHORS b/AUTHORS index 87b3ccdf..328218de 100644 --- 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 5640ee88..d1df6a84 100755 --- 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 } -- 2.30.2