acinclude.m4: Reorganize checks for kernel identifiers.

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

diff --git a/xenserver/usr_share_openvswitch_scripts_sysconfig.template b/xenserver/usr_share_openvswitch_scripts_sysconfig.template
index 9bd51bc..6492931 100644 (file)
--- 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.
@@ -232,3 +236,11 @@
 #     This option's value is honored only when BRCOMPATD_VALGRIND_LOG is
 #     set to a nonempty string.
 # BRCOMPATD_VALGRIND_OPT=""
+
+# XENSERVERD_PIDFILE: File in which to store the pid of the running
+#     ovs-xenserved.
+# XENSERVERD_PIDFILE=/var/run/openvswitch/ovs-xenserverd.pid
+
+# XENSERVERD_RUN_DIR: Set the directory in which ovs-xenserverd should be
+#     run.  This mainly affects where core files will be placed.
+# XENSERVERD_RUN_DIR=/var/xen/openvswitch