summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@ovn.org>2016-08-10 16:05:14 -0700
committerJustin Pettit <jpettit@ovn.org>2016-08-12 02:29:01 -0700
commit1da17ab52966e2eb06717f3614e39172a65ea02c (patch)
tree35f314648d14db5aa5afca907f242640ffa3980b
parent7cc36b8fe77610961498c96465bd7911ce50ff2d (diff)
downloadopenvswitch-1da17ab52966e2eb06717f3614e39172a65ea02c.tar.gz
daemon: Minor tweaking of man page fragment.
Signed-off-by: Justin Pettit <jpettit@ovn.org> Acked-by: Ben Pfaff <blp@ovn.org> Acked-by: Ryan Moats <rmoats@us.ibm.com>
-rw-r--r--lib/daemon.man4
-rw-r--r--lib/daemon.xml9
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/daemon.man b/lib/daemon.man
index f4e79ac11..2e6d99aca 100644
--- a/lib/daemon.man
+++ b/lib/daemon.man
@@ -74,8 +74,8 @@ allowed, with current user or group are assumed respectively. Only daemons
started by the root user accepts this argument.
.IP
On Linux, daemons will be granted CAP_IPC_LOCK and CAP_NET_BIND_SERVICES
-before dropping root privileges. Daemons interact with datapath,
-such as ovs-vswitchd, will be granted two additional capabilities, namely
+before dropping root privileges. Daemons that interact with a datapath,
+such as \fBovs\-vswitchd\fR, will be granted two additional capabilities, namely
CAP_NET_ADMIN and CAP_NET_RAW. The capability change will apply even if
new user is "root".
.IP
diff --git a/lib/daemon.xml b/lib/daemon.xml
index d752e99a0..737ae55e5 100644
--- a/lib/daemon.xml
+++ b/lib/daemon.xml
@@ -106,10 +106,11 @@
<p>
On Linux, daemons will be granted <code>CAP_IPC_LOCK</code> and
<code>CAP_NET_BIND_SERVICES</code> before dropping root privileges.
- Daemons interact with datapath, such as <code>ovs-vswitchd</code>, will
- be granted two additional capabilities, namely <code>CAP_NET_ADMIN</code>
- and <code>CAP_NET_RAW</code>. The capability change will apply even if
- the new user is root.
+ Daemons that interact with a datapath, such as
+ <code>ovs-vswitchd</code>, will be granted two additional
+ capabilities, namely <code>CAP_NET_ADMIN</code> and
+ <code>CAP_NET_RAW</code>. The capability change will apply even
+ if the new user is root.
</p>
<p>