Merge "citrix" branch into "master".

[sliver-openvswitch.git] / xenserver / usr_share_vswitch_scripts_sysconfig.template

diff --git a/xenserver/usr_share_vswitch_scripts_sysconfig.template b/xenserver/usr_share_vswitch_scripts_sysconfig.template
index b9d7ecb..4d5efca 100644 (file)
--- a/xenserver/usr_share_vswitch_scripts_sysconfig.template
+++ b/xenserver/usr_share_vswitch_scripts_sysconfig.template
@@ -103,7 +103,7 @@
 
 # VSWITCHD_OVSDB_SCHEMA: Schema file to use for generating a new OVSDB
 #     ovs-vswitchd database.
-# VSWITCHD_OVSDB_SCHEMA=/usr/share/vswitch/vswitch-idl.ovsschema
+# VSWITCHD_OVSDB_SCHEMA=/usr/share/vswitch/vswitch.ovsschema
 
 # VSWITCHD_PIDFILE: File in which to store the pid of the running
 #     ovs-vswitchd.
@@ -117,6 +117,13 @@
 #     processes.
 # VSWITCHD_PRIORITY=-10
 
+# VSWITCHD_MLOCKALL: Whether to pass ovs-vswitchd the --mlockall option.
+#     This option should be set to "yes" or "no".  The default is "yes".
+#     Enabling this option can avoid networking interruptions due to
+#     system memory pressure in extraordinary situations, such as multiple
+#     concurrent VM import operations.
+# VSWITCHD_MLOCKALL=yes
+
 # VSWITCHD_LOGFILE: File to send the FILE_LOGLEVEL log messages to.
 # VSWITCHD_LOGFILE=/var/log/ovs-vswitchd.log