diff options
author | Ian Campbell <Ian.Campbell@citrix.com> | 2010-03-26 13:24:06 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2010-03-26 14:42:55 -0700 |
commit | 06e41baf2ae176050cfe71a7824a17cc95cf388c (patch) | |
tree | ba9d1087679ce5911add23e4845a28a5335d1480 /xenserver/usr_share_openvswitch_scripts_sysconfig.template | |
parent | a1864c5f89fcbec040703e46c709a4799ef72f0b (diff) | |
download | openvswitch-06e41baf2ae176050cfe71a7824a17cc95cf388c.tar.gz |
xenserver: Disable brcompatd except on XenServer 5.5.0
The compat layer is now unused in the vswitch branch of XenServer.
Based on change originally by Ian Campbell, cherry-picked from
"xs5.7" branch. The original change was not conditional on the
XenServer version.
Diffstat (limited to 'xenserver/usr_share_openvswitch_scripts_sysconfig.template')
-rw-r--r-- | xenserver/usr_share_openvswitch_scripts_sysconfig.template | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xenserver/usr_share_openvswitch_scripts_sysconfig.template b/xenserver/usr_share_openvswitch_scripts_sysconfig.template index 9bd51bc2b..c639df81a 100644 --- a/xenserver/usr_share_openvswitch_scripts_sysconfig.template +++ b/xenserver/usr_share_openvswitch_scripts_sysconfig.template @@ -9,13 +9,17 @@ # ENABLE_BRCOMPAT: If 'y' than emulate linux bridging interfaces # using the brcompat kernel module and ovs-brcompatd daemon -# ENABLE_BRCOMPAT=y +# This is required and enabled by default for XenServer 5.5.0, +# and not required and not enabled by default for later versions. +# ENABLE_BRCOMPAT=? # ENABLE_FAKE_PROC_NET: If 'y' then emulate linux bonding and vlan # files in /proc as if the bonding and vlan demultiplexing done in # ovs-vswitchd were being implemented using existing Linux mechanisms. # This is useful in some cases when replacing existing solutions. -# ENABLE_FAKE_PROC_NET=y +# This is required and enabled by default for XenServer 5.5.0, +# and not required and not enabled by default for later versions. +# ENABLE_FAKE_PROC_NET=? # ENABLE_MONITOR: If 'y' then monitor daemon processes and restart them # if they die due to an error signal. |