From 8d2662a5791cd2aaa230ed829e018cb4b059fee7 Mon Sep 17 00:00:00 2001 From: Patrick Mullaney Date: Wed, 15 Dec 2010 11:07:10 -0800 Subject: [PATCH] xenserver: Remove Linux bridge on startup if no bridges exist. Otherwise, if the bridge module is loaded but no bridges exist, on all but the most recent Linux kernels this prevents the Open vSwitch kernel module from loading. Signed-off-by: Ben Pfaff --- xenserver/etc_init.d_openvswitch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch index fc89a3e91..b87d5ae10 100755 --- a/xenserver/etc_init.d_openvswitch +++ b/xenserver/etc_init.d_openvswitch @@ -181,6 +181,14 @@ function remove_all_dp { } function insert_modules_if_required { + if test -e /sys/module/bridge; then + bridges=`echo /sys/class/net/*/bridge | sed 's,/sys/class/net/,,g;s,/bridge,,g'` + if test "$bridges" != "*"; then + log_warning_msg "not removing bridge module because bridges exist ($bridges)" + else + action "removing bridge module" rmmod bridge + fi + fi if ! lsmod | grep -q "openvswitch_mod"; then action "Inserting llc module" modprobe llc action "Inserting openvswitch module" modprobe openvswitch_mod -- 2.20.1