Skip to content

Commit

Permalink
generate: change process-tty to process-terminal
Browse files Browse the repository at this point in the history
Signed-off-by: Zhou Hao <[email protected]>
  • Loading branch information
Zhou Hao committed Nov 15, 2017
1 parent eead136 commit 7bd99c7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions cmd/oci-runtime-tool/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ var generateFlags = []cli.Flag{
cli.StringSliceFlag{Name: "process-rlimits-add", Usage: "specifies resource limits for processes inside the container. "},
cli.StringSliceFlag{Name: "process-rlimits-remove", Usage: "remove specified resource limits for processes inside the container. "},
cli.BoolFlag{Name: "process-rlimits-remove-all", Usage: "remove all resource limits for processes inside the container. "},
cli.BoolFlag{Name: "process-tty", Usage: "allocate a new tty for the container process"},
cli.BoolFlag{Name: "process-terminal", Usage: "specifies terminal attach to the process"},
cli.IntFlag{Name: "process-uid", Usage: "uid for the process"},
cli.StringFlag{Name: "rootfs-path", Value: "rootfs", Usage: "path to the root filesystem"},
cli.BoolFlag{Name: "rootfs-readonly", Usage: "make the container's rootfs readonly"},
Expand Down Expand Up @@ -206,8 +206,8 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
g.SetProcessNoNewPrivileges(context.Bool("process-no-new-privileges"))
}

if context.IsSet("process-tty") {
g.SetProcessTerminal(context.Bool("process-tty"))
if context.IsSet("process-terminal") {
g.SetProcessTerminal(context.Bool("process-terminal"))
}

if context.IsSet("args") {
Expand Down
2 changes: 1 addition & 1 deletion completions/bash/oci-runtime-tool
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ _oci-runtime-tool_generate() {
--process-cap-drop-all
--process-no-new-privileges
--process-rlimits-remove-all
--process-tty
--process-terminal
--rootfs-readonly
"

Expand Down
4 changes: 2 additions & 2 deletions man/oci-runtime-tool-generate.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,8 @@ read the configuration from `config.json`.
**--process-rlimits-remove-all**=true|false
Remove all resource limits for process inside the container. The default is *false*.

**--process-tty**=true|false
Allocate a new tty for the container process. The default is *false*.
**--process-terminal**=true|false
Specifies terminal attach to the process. The default is *false*.

**--process-uid**=UID
Sets the UID used within the container.
Expand Down

0 comments on commit 7bd99c7

Please sign in to comment.