Skip to content

Commit

Permalink
Fix documents
Browse files Browse the repository at this point in the history
Signed-off-by: Bily Zhang <[email protected]>
  • Loading branch information
mooncak committed Oct 21, 2018
1 parent 7bccf74 commit f2b95cf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/crio.conf.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ The `crio.runtime` table contains settings pertaining to the OCI runtime used an
- If kubelet does not provide any information about the container workload trust level, the selected runtime will depend on the default_container_trust setting. If it is set to untrusted, then all containers except for the host privileged ones, will be run by the runtime_untrusted_workload runtime. Host privileged containers are by definition trusted and will always use the trusted container runtime. If default_container_trust is set to "trusted", CRI-O will use the trusted container runtime for all containers.

**no_pivot**=*false*
If true, the runtime will not use use `pivot_root`, but instead use `MS_MOVE`.
If true, the runtime will not use `pivot_root`, but instead use `MS_MOVE`.

**conmon**="/usr/local/libexec/crio/conmon"
Path to the conmon binary, used for monitoring the OCI runtime.
Expand Down
2 changes: 1 addition & 1 deletion test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $ ./install.sh /usr/local
```

You will also need to install the [CNI](https://github.com/containernetworking/cni) plugins as
the the default pod test template runs without host networking:
the default pod test template runs without host networking:

```
$ cd "$GOPATH/src/github.com/containernetworking"
Expand Down

0 comments on commit f2b95cf

Please sign in to comment.