Skip to content

Commit a618ab5

Browse files
Merge pull request #1695 from Taeung/fix-console-man
man: Fix manpages related to console
2 parents 7af2e25 + 862e491 commit a618ab5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

man/runc-create.8.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ command(s) that get executed on start, edit the args parameter of the spec. See
2020

2121
# OPTIONS
2222
--bundle value, -b value path to the root of the bundle directory, defaults to the current directory
23-
--console value specify the pty slave path for use with the container
23+
--console-socket value path to an AF_UNIX socket which will receive a file descriptor referencing the master end of the console's pseudoterminal
2424
--pid-file value specify the file to write the process id to
2525
--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
2626
--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
27+
--preserve-fds value Pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0)

man/runc-run.8.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ command(s) that get executed on start, edit the args parameter of the spec. See
2020

2121
# OPTIONS
2222
--bundle value, -b value path to the root of the bundle directory, defaults to the current directory
23-
--console value specify the pty slave path for use with the container
23+
--console-socket value path to an AF_UNIX socket which will receive a file descriptor referencing the master end of the console's pseudoterminal
2424
--detach, -d detach from the container's process
2525
--pid-file value specify the file to write the process id to
2626
--no-subreaper disable the use of the subreaper used to reap reparented processes
2727
--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
2828
--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
29+
--preserve-fds value Pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0)

0 commit comments

Comments
 (0)