From 0df3f79fc023080ac8cc0cc7d886e77179177fbc Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 2 Nov 2016 10:59:09 -0700 Subject: [PATCH] criu(8): fix --inherit-fd description This patch describes the correct syntax of --inherit-fd. travis-ci: success for Add/fix description of --external and --inherit-fd CC: Andrei Vagin Signed-off-by: Kir Kolyshkin Signed-off-by: Pavel Emelyanov --- Documentation/criu.txt | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Documentation/criu.txt b/Documentation/criu.txt index cc80f8763..5872859d9 100644 --- a/Documentation/criu.txt +++ b/Documentation/criu.txt @@ -263,11 +263,23 @@ For example, the command line for the above example should look like this: ~~~~~~~~~ Restores previously checkpointed processes. -*--inherit-fd* *fd[*'N'*]:*'path':: - Inherit file descriptors. This asks *criu* to use an already opened - file descriptor 'N' for restoring a file indentified by 'path'. Note - that the 'N' must be enclosed in a literal square brackets, that - usually needs to be escaped from shell. +*--inherit-fd* *fd[*'N'*]:*'resource':: + Inherit a file descriptor. This option lets *criu* use an already opened + file descriptor 'N' for restoring a file indentified by 'resource'. + This option can be used to restore an external resource dumped + with the help of *--external* *file*, *tty*, and *unix* options. ++ +The 'resource' argument can be one of the following: ++ + - *tty[*'rdev'*:*'dev'*]* + - *pipe[*'inode'*]* + - *socket[*'inode'*]* + - *file[*'mnt_id'*:*'inode'*]* + - 'path/to/file' + ++ +Note that square brackets used in this option arguments are literals and +usually need to be escaped from shell. *-d*, *--restore-detached*:: Detach *criu* itself once restore is complete.