git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: omit _mod from module names
[sliver-openvswitch.git]
/
utilities
/
ovs-ctl.8
diff --git
a/utilities/ovs-ctl.8
b/utilities/ovs-ctl.8
index
0e41162
..
06ccfec
100644
(file)
--- a/
utilities/ovs-ctl.8
+++ b/
utilities/ovs-ctl.8
@@
-124,9
+124,8
@@
ID that persists from one run to another (stored in a file). When
another string is specified \fBovs\-ctl\fR uses it literally.
.
.PP
another string is specified \fBovs\-ctl\fR uses it literally.
.
.PP
-On systems that have the \fBlsb_release\fR program, \fBovs\-ctl\fR
-chooses reasonable defaults for the following options. Other systems
-should specify values:
+The following options should be specified if the defaults are not
+suitable:
.
.IP "\fB\-\-system\-type=\fItype\fR"
.IQ "\fB\-\-system\-version=\fIversion\fR"
.
.IP "\fB\-\-system\-type=\fItype\fR"
.IQ "\fB\-\-system\-version=\fIversion\fR"
@@
-135,6
+134,11
@@
Sets the value to store in the \fBsystem-type\fR and
\fBOpen_vSwitch\fR table. Remote managers may use these values to
determine the kind of system to which they are connected (primarily
for display to human administrators).
\fBOpen_vSwitch\fR table. Remote managers may use these values to
determine the kind of system to which they are connected (primarily
for display to human administrators).
+.IP
+When not specified, \fBovs\-ctl\fR uses values from the optional
+\fBsystem\-type.conf\fR and \fBsystem\-version.conf\fR files(see section
+\fBFILES\fR) or it uses the \fBlsb_release\fR program, if present, to
+provide reasonable defaults.
.
.PP
The following options are also likely to be useful:
.
.PP
The following options are also likely to be useful:
@@
-278,8
+282,8
@@
from other errors that may occur when running the \fBstart\fR command.
.
.PP
By default the \fBload\-kmod\fR command attempts to load the
.
.PP
By default the \fBload\-kmod\fR command attempts to load the
-openvswitch
_mod
kernel module. If the \fB\-\-brcompat\fR option is
-specified then the brcompat
_mod
kernel module is also loaded.
+openvswitch kernel module. If the \fB\-\-brcompat\fR option is
+specified then the brcompat kernel module is also loaded.
.
.SH "The ``enable\-protocol'' command"
.
.
.SH "The ``enable\-protocol'' command"
.
@@
-400,6
+404,11
@@
location).
The persistent system UUID created and read by
\fB\-\-system\-id=random\fR.
.
The persistent system UUID created and read by
\fB\-\-system\-id=random\fR.
.
+.IP "\fIsysconfdir\fB/openvswitch/system\-type.conf\fR"
+.IQ "\fIsysconfdir\fB/openvswitch/system\-version.conf\fR"
+The \fBsystem\-type\fR and \fBsystem\-version\fR values stored in the database's
+\fBOpen_vSwitch\fR table when not specified as a command-line option.
+.
.SH "EXAMPLE"
.
.PP
.SH "EXAMPLE"
.
.PP