summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-07-27 13:11:20 -0700
committerBen Pfaff <blp@nicira.com>2012-07-27 13:15:02 -0700
commit21c9a7ede8b3046459699beb233a5e07079f92d9 (patch)
tree2667acc536cd770485fb21e37e03eae1ab8818bb
parent437f9686a8cb75dafc38f6dd38ff5b42fe34580d (diff)
downloadopenvswitch-21c9a7ede8b3046459699beb233a5e07079f92d9.tar.gz
ovs-ctl: Start the rest of Open vSwitch if loading brcompat module fails.
This may be more useful in practice than failing the entire OVS startup sequence. Debian bug #681955. CC: 681955@bugs.debian.org Reported-by: Bastian Blank <waldi@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Simon Horman <horms@verge.net.au>
-rwxr-xr-xutilities/ovs-ctl.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index dff5f8434..527bd60b8 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -59,7 +59,12 @@ insert_brcompat_mod_if_required () {
insert_mod_if_required () {
insert_openvswitch_mod_if_required || return 1
if test X"$BRCOMPAT" = Xyes; then
- insert_brcompat_mod_if_required || return 1
+ if insert_brcompat_mod_if_required; then
+ :
+ else
+ log_warning_msg "could not load brcompat module, disabling bridge compatibility"
+ BRCOMPAT=no
+ fi
fi
}