jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kill: make second argument optional 

commit b517076907 added a check that kill accepts two arguments.
Since the second argument is optional, change it back to accept the
shorter form "kill CONTAINER".

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2017-01-18 22:49:44 +01:00
parent a9610f2c02
commit b760919f33
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kill.go
View File

@ -52,10 +52,10 @@ var signalMap = map[string]syscall.Signal{
var killCommand = cli.Command{ var killCommand = cli.Command{
Name: "kill", Name: "kill",
Usage: "kill sends the specified signal (default: SIGTERM) to the container's init process", Usage: "kill sends the specified signal (default: SIGTERM) to the container's init process",
ArgsUsage: `<container-id> <signal> ArgsUsage: `<container-id> [signal]
Where "<container-id>" is the name for the instance of the container and Where "<container-id>" is the name for the instance of the container and
"<signal>" is the signal to be sent to the init process. "[signal]" is the signal to be sent to the init process.
EXAMPLE: EXAMPLE:
For example, if the container id is "ubuntu01" the following will send a "KILL" For example, if the container id is "ubuntu01" the following will send a "KILL"
@ -69,7 +69,7 @@ signal to the init process of the "ubuntu01" container:
}, },
}, },
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
if err := checkArgs(context, 2, exactArgs); err != nil { if err := checkArgs(context, 1, minArgs); err != nil {
return err return err
} }
container, err := getContainer(context) container, err := getContainer(context)