xenserver: Replace customized xen-bugtool with plugin to collect qdisc info.

[openvswitch] / INSTALL.Linux

diff --git a/INSTALL.Linux b/INSTALL.Linux
index f80e1c645fec5b30c5d438dd1df7a8c02f7529ae..8ba73ed353ab5a7b816853ad19f19eda4ac6d783 100644 (file)
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -3,7 +3,7 @@
 
 This document describes how to build and install Open vSwitch on a
 generic Linux host.  If you want to install Open vSwitch on a Citrix
 
 This document describes how to build and install Open vSwitch on a
 generic Linux host.  If you want to install Open vSwitch on a Citrix

-XenServer version 5.5.0, see INSTALL.XenServer instead.
+XenServer, see INSTALL.XenServer instead.

 
 This version of Open vSwitch may be built manually with "configure"
 and "make", as described below.  You may also build Debian packages by
 
 This version of Open vSwitch may be built manually with "configure"
 and "make", as described below.  You may also build Debian packages by


@@ -240,7 +240,8 @@ Prerequisites section, follow the procedure below to build.
 
 7. Initialize the configuration database using ovsdb-tool, e.g.:
 
 
 7. Initialize the configuration database using ovsdb-tool, e.g.:
 

-      % ovsdb-tool create /usr/local/etc/ovs-vswitchd.conf.db vswitchd/vswitch.ovsschema
+      % mkdir -p /usr/local/etc/openvswitch
+      % ovsdb-tool create /usr/local/etc/openvswitch/conf.db vswitchd/vswitch.ovsschema

 
 Startup
 =======
 
 Startup
 =======


@@ -253,7 +254,7 @@ installation, above, to listen on a Unix domain socket, to connect to
 any managers specified in the database itself, and to use the SSL
 configuration in the database:
 
 any managers specified in the database itself, and to use the SSL
 configuration in the database:
 

-      % ovsdb-server /usr/local/etc/ovs-vswitchd.conf.db \
+      % ovsdb-server /usr/local/etc/openvswitch/conf.db \

                       --remote=punix:/usr/local/var/run/openvswitch/db.sock \
                       --remote=db:Open_vSwitch,managers \
                       --private-key=db:SSL,private_key \
                       --remote=punix:/usr/local/var/run/openvswitch/db.sock \
                       --remote=db:Open_vSwitch,managers \
                       --private-key=db:SSL,private_key \


@@ -305,7 +306,7 @@ also upgrade the database schema:
       - If you want to preserve the contents of your database, back it
         up first, then use "ovsdb-tool convert" to upgrade it, e.g.:
 
       - If you want to preserve the contents of your database, back it
         up first, then use "ovsdb-tool convert" to upgrade it, e.g.:
 

-        % ovsdb-tool convert /usr/local/etc/ovs-vswitchd.conf.db vswitchd/vswitch.ovsschema
+        % ovsdb-tool convert /usr/local/etc/openvswitch/conf.db vswitchd/vswitch.ovsschema

 
 4. Start the Open vSwitch daemons as described under "Building and
    Installing Open vSwitch for Linux" above.
 
 4. Start the Open vSwitch daemons as described under "Building and
    Installing Open vSwitch for Linux" above.