From 21c9a7ede8b3046459699beb233a5e07079f92d9 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 27 Jul 2012 13:11:20 -0700 Subject: 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 Signed-off-by: Ben Pfaff Acked-by: Simon Horman --- utilities/ovs-ctl.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in index dff5f843..527bd60b 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 } -- cgit v1.2.3