datapath: Set the correct bits for OFPAT_SET_NW_TOS action.

[openvswitch] / ovsdb / ovsdb-server.1.in

diff --git a/ovsdb/ovsdb-server.1.in b/ovsdb/ovsdb-server.1.in
index 53cce88785f0eeafe766a47ad0385e6427361d1c..17c955e37336d0e78c86afe39f9bf808932d8942 100644 (file)
--- a/ovsdb/ovsdb-server.1.in
+++ b/ovsdb/ovsdb-server.1.in
@@ -9,6 +9,7 @@ ovsdb\-server \- Open vSwitch database server
 \fBovsdb\-server\fR
 \fIdatabase\fR
 [\fB--remote=\fIremote\fR]\&...
+[\fB--run=\fIcommand\fR]
 .so lib/daemon-syn.man
 .so lib/vlog-syn.man
 .so lib/common-syn.man
@@ -29,43 +30,37 @@ Adds \fIremote\fR as a connection method used by \fBovsdb\-server\fR.
 \fIremote\fR must take one of the following forms:
 .
 .RS
-.IP "\fBptcp:\fIport\fR[\fB:\fIip\fR]"
-Listens for JSON-RPC connections on the given TCP \fIport\fR.  By
-default, \fB\*(PN\fR listens for connections to any local IP address,
-but \fIip\fR may be specified to listen only for connections to the
-given \fIip\fR.
-.
-.IP "\fBpunix:\fIfile\fR"
-Listens for JSON-RPC connections on the Unix domain server socket
-named \fIfile\fR.
-.
-.IP "\fBtcp:\fIip\fB:\fIport\fR"
-Initiates a JSON-RPC connection to the given TCP \fIport\fR on
-\fIip\fR and reconnects as necessary.
-.
-.IP "\fBunix:\fIfile\fR"
-Initiates a JSON-RPC connection to the Unix domain server socket named
-\fIfile\fR as reconnects as necessary.
-.
-.IP "\fBdb:\fItable\fB,\fIcolumn\fR"
-Reads additional connection methods from \fIcolumn\fR in all of the
-rows in \fItable\fR within the \fBovsdb\-server\fR database.  The
-\fIcolumn\fR must have type string or set of strings.  The connection
-methods in the column must have one of the forms described above.  As
-the contents of \fIcolumn\fR changes, \fBovsdb\-server\fR also adds
-and drops connection methods accordingly.
+.so ovsdb/remote-passive.man
+.so ovsdb/remote-active.man
 .RE
 .
+.IP "\fB\-\-run=\fIcommand\fR]"
+Ordinarily \fBovsdb\-server\fR runs forever, or until it is told to
+exit (see \fBRUNTIME MANAGEMENT COMMANDS\fR below).  With this option,
+\fBovsdb\-server\fR instead starts a shell subprocess running
+\fIcommand\fR.  When the subprocess terminates, \fBovsdb\-server\fR
+also exits gracefully.  If the subprocess exits normally with exit
+code 0, then \fBovsdb\-server\fR exits with exit code 0 also;
+otherwise, it exits with exit code 1.
+.IP
+This option can be useful where a database server is needed only to
+run a single command, e.g.:
+.B "ovsdb-server --remote=punix:socket --run='ovsdb-client dump unix:socket Open_vSwitch'"
 .SS "Daemon Options"
 .so lib/daemon.man
 .SS "Logging Options"
 .so lib/vlog.man
+.so lib/ssl.man
 .SS "Other Options"
 .so lib/common.man
 .SH "RUNTIME MANAGEMENT COMMANDS"
 \fBovs\-appctl\fR(8) can send commands to a running
 \fBovsdb\-server\fR process.  The currently supported commands are
 described below.
+.SS "OVSDB-SERVER COMMANDS"
+These commands are specific to \fBovsdb\-server\fR.
+.IP "\fBexit\fR"
+Causes \fBovsdb\-server\fR to gracefully terminate.
 .so lib/vlog-unixctl.man
 .SH "SEE ALSO"
 .