diff options
author | Ben Pfaff <blp@nicira.com> | 2012-07-27 13:11:20 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2012-07-27 13:14:45 -0700 |
commit | 78065c09bff56b1a29470afcd1d7835e85cf8f87 (patch) | |
tree | 306ff8accd642350ab790e7021fe67e5bb6ef53a | |
parent | e5c774b164cb62852622197e52c2f68dd18d9198 (diff) | |
download | openvswitch-78065c09bff56b1a29470afcd1d7835e85cf8f87.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-x | utilities/ovs-ctl.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in index 0af90f07c..3632879cf 100755 --- a/utilities/ovs-ctl.in +++ b/utilities/ovs-ctl.in @@ -64,7 +64,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 } |