Commit 027e13fd authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Pavel Emelyanov

criu --help: rectify --join-ns

* Fix English and rephrase
* Mark with curly braces that PID and NS_FILE are exclusive options
* Fix 80 columns violations
* Remove usage examples
* Remove the "experimental feature" warning
* Add an empty line before "Check options" header

As for removals, I believe --help output is not the proper place for
examples or notices.

Was:
  -J|--join-ns NS:PID|NS_FILE[,EXTRA_OPTS]
                        Join exist namespace and restore process in it.
                        Namespace can be specified in pid or file path format.
                            --join-ns net:12345 or --join-ns net:/foo/bar.
                        Extra_opts is optional, for now only user namespace support:
                            --join-ns user:PID,UID,GID to specify uid and gid.
                        Please NOTE: join-ns with user-namespace is not fully tested.
                        It may be dangerous to use this feature
Check options:

Now:
  -J|--join-ns NS:{PID|NS_FILE}[,OPTIONS]
                        Join existing namespace and restore process in it.
                        Namespace can be specified as either pid or file path.
                        OPTIONS can be used to specify parameters for userns:
                            user:PID,UID,GID
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent f9c3bff0
...@@ -892,14 +892,12 @@ usage: ...@@ -892,14 +892,12 @@ usage:
" file[mnt_id:inode]\n" " file[mnt_id:inode]\n"
" --empty-ns net Create a namespace, but don't restore its properies\n" " --empty-ns net Create a namespace, but don't restore its properies\n"
" (assuming it will be restored by action scripts)\n" " (assuming it will be restored by action scripts)\n"
" -J|--join-ns NS:PID|NS_FILE[,EXTRA_OPTS]\n" " -J|--join-ns NS:{PID|NS_FILE}[,OPTIONS]\n"
" Join exist namespace and restore process in it.\n" " Join existing namespace and restore process in it.\n"
" Namespace can be specified in pid or file path format.\n" " Namespace can be specified as either pid or file path.\n"
" --join-ns net:12345 or --join-ns net:/foo/bar.\n" " OPTIONS can be used to specify parameters for userns:\n"
" Extra_opts is optional, for now only user namespace support:\n" " user:PID,UID,GID\n"
" --join-ns user:PID,UID,GID to specify uid and gid.\n" "\n"
" Please NOTE: join-ns with user-namespace is not fully tested.\n"
" It may be dangerous to use this feature\n"
"Check options:\n" "Check options:\n"
" without any arguments, \"criu check\" checks availability of absolutely required\n" " without any arguments, \"criu check\" checks availability of absolutely required\n"
" kernel features; if any of these features is missing dump and restore will fail\n" " kernel features; if any of these features is missing dump and restore will fail\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment