Skip to content

Commit

Permalink
Merge pull request #1695 from Taeung/fix-console-man
Browse files Browse the repository at this point in the history
man: Fix manpages related to console
  • Loading branch information
crosbymichael committed Feb 8, 2018
2 parents 7af2e25 + 862e491 commit a618ab5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion man/runc-create.8.md
Expand Up @@ -20,7 +20,8 @@ command(s) that get executed on start, edit the args parameter of the spec. See

# OPTIONS
--bundle value, -b value path to the root of the bundle directory, defaults to the current directory
--console value specify the pty slave path for use with the container
--console-socket value path to an AF_UNIX socket which will receive a file descriptor referencing the master end of the console's pseudoterminal
--pid-file value specify the file to write the process id to
--no-pivot do not use pivot root to jail process inside rootfs. This should be used whenever the rootfs is on top of a ramdisk
--no-new-keyring do not create a new session keyring for the container. This will cause the container to inherit the calling processes session key
--preserve-fds value Pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0)
3 changes: 2 additions & 1 deletion man/runc-run.8.md
Expand Up @@ -20,9 +20,10 @@ command(s) that get executed on start, edit the args parameter of the spec. See

# OPTIONS
--bundle value, -b value path to the root of the bundle directory, defaults to the current directory
--console value specify the pty slave path for use with the container
--console-socket value path to an AF_UNIX socket which will receive a file descriptor referencing the master end of the console's pseudoterminal
--detach, -d detach from the container's process
--pid-file value specify the file to write the process id to
--no-subreaper disable the use of the subreaper used to reap reparented processes
--no-pivot do not use pivot root to jail process inside rootfs. This should be used whenever the rootfs is on top of a ramdisk
--no-new-keyring do not create a new session keyring for the container. This will cause the container to inherit the calling processes session key
--preserve-fds value Pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0)

0 comments on commit a618ab5

Please sign in to comment.