diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-22 22:10:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 22:10:07 +0100 |
| commit | 84b3f2a7f622636e622416403d1f2642edbbd117 (patch) | |
| tree | 56abfe745ffb65c6fbb75824807345c217d684f8 /cmd/podman/kill.go | |
| parent | c757cb23ca15634077a8b9fa33aba7abd1c8249b (diff) | |
| parent | 6ab6e2c3073d47755d441ee8c1bce90e34082e99 (diff) | |
| download | podman-84b3f2a7f622636e622416403d1f2642edbbd117.tar.gz podman-84b3f2a7f622636e622416403d1f2642edbbd117.tar.bz2 podman-84b3f2a7f622636e622416403d1f2642edbbd117.zip | |
Merge pull request #2386 from baude/cobravalidation
Improve command line validation
Diffstat (limited to 'cmd/podman/kill.go')
| -rw-r--r-- | cmd/podman/kill.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/kill.go b/cmd/podman/kill.go index 1be4fa959..eb72d53e7 100644 --- a/cmd/podman/kill.go +++ b/cmd/podman/kill.go @@ -28,6 +28,9 @@ var ( killCommand.GlobalFlags = MainGlobalOpts return killCmd(&killCommand) }, + Args: func(cmd *cobra.Command, args []string) error { + return checkAllAndLatest(cmd, args, false) + }, Example: `podman kill mywebserver podman kill 860a4b23 podman kill --signal TERM ctrID`, @@ -43,6 +46,7 @@ func init() { flags.StringVarP(&killCommand.Signal, "signal", "s", "KILL", "Signal to send to the container") flags.BoolVarP(&killCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of") + markFlagHiddenForRemoteClient("latest", flags) } // killCmd kills one or more containers with a signal @@ -52,10 +56,6 @@ func killCmd(c *cliconfig.KillValues) error { killSignal uint = uint(syscall.SIGTERM) ) - if err := checkAllAndLatest(&c.PodmanCommand); err != nil { - return err - } - rootless.SetSkipStorageSetup(true) runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand) if err != nil { |