acinclude.m4: Reorganize checks for kernel identifiers.

[sliver-openvswitch.git] / INSTALL.Linux

diff --git a/INSTALL.Linux b/INSTALL.Linux
index 9115581..20a0dd8 100644 (file)
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -69,6 +69,11 @@ you will also need the following software:
 
     - Python 2.x, for x >= 4.
 
+If you modify the ovsdbmonitor tool, then you will also need the
+following:
+
+    - pyuic4 from PyQt4 (http://www.riverbankcomputing.co.uk).
+
 Installation Requirements
 -------------------------
 
@@ -91,6 +96,22 @@ following software:
       if it is installed in a different location, then some Open
       vSwitch log messages will not be as detailed.
 
+To run the ovsdmonitor tool, the machine must also have the following
+software:
+
+    - Python 2.x, for x >= 4.
+
+    - Python Twisted Conch.
+
+    - Python JSON.
+
+    - PySide or PyQt4.
+
+    - Python Zope interface module.
+
+(On Debian "lenny" the above can be installed with "apt-get install
+python-json python-qt4 python-zopeinterface python-twisted-conch".)
+
 Building and Installing Open vSwitch for Linux
 ==============================================
 
@@ -157,7 +178,7 @@ Prerequisites section, follow the procedure below to build.
 
 7. Initialize the configuration database using ovsdb-tool, e.g.:
 
-      % ovsdb-tool create /etc/ovs-vswitchd.conf.db vswitchd/vswitch.ovsschema
+      % ovsdb-tool create /usr/local/etc/ovs-vswitchd.conf.db vswitchd/vswitch.ovsschema
 
 Startup
 =======
@@ -167,12 +188,18 @@ configuration database, ovsdb-server.  Configure it to use the
 database you created during step 7 of installation, above, and to
 listen on a Unix domain socket, e.g.:
 
-      % ovsdb-server /etc/ovs-vswitchd.conf.db --remote=punix:/var/run/ovsdb-server
+      % ovsdb-server /usr/local/etc/ovs-vswitchd.conf.db --remote=punix:/usr/local/var/run/openvswitch/db.sock
+
+Then initialize the database with "ovs-vsctl init".  This is only
+necessary the first time after you create the database with
+ovsdb-tool (but running it at any time is harmless):
+
+      % ovs-vsctl init
 
 Then start the main Open vSwitch daemon, telling it to connect to the
 same Unix domain socket:
 
-      % ovs-vswitchd unix:/var/run/ovsdb-server
+      % ovs-vswitchd unix:/usr/local/var/run/openvswitch/db.sock
 
 Now you may use ovs-vsctl to set up bridges and other Open vSwitch
 features.  For example, to create a bridge named br0 and add ports