diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-08-28 08:43:48 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-28 11:25:01 +0000 |
| commit | 660bb0196ca0e8e8e10d45f9a781c0bbc3b7c5dd (patch) | |
| tree | 95a0c63129d7635d43fd515d81bb1db33f995b6b /cmd/podman | |
| parent | ff4c7a068add2b0a910d2e7f3d442a5c93586e98 (diff) | |
| download | podman-660bb0196ca0e8e8e10d45f9a781c0bbc3b7c5dd.tar.gz podman-660bb0196ca0e8e8e10d45f9a781c0bbc3b7c5dd.tar.bz2 podman-660bb0196ca0e8e8e10d45f9a781c0bbc3b7c5dd.zip | |
rootless, kill: do not create a new userns
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Closes: #1360
Approved by: vrothberg
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/kill.go | 2 | ||||
| -rw-r--r-- | cmd/podman/main.go | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cmd/podman/kill.go b/cmd/podman/kill.go index 388c779f6..927d22ba7 100644 --- a/cmd/podman/kill.go +++ b/cmd/podman/kill.go @@ -6,6 +6,7 @@ import ( "fmt" "github.com/containers/libpod/cmd/podman/libpodruntime" + "github.com/containers/libpod/pkg/rootless" "github.com/docker/docker/pkg/signal" "github.com/pkg/errors" "github.com/urfave/cli" @@ -45,6 +46,7 @@ func killCmd(c *cli.Context) error { return err } + rootless.SetSkipStorageSetup(true) runtime, err := libpodruntime.GetRuntime(c) if err != nil { return errors.Wrapf(err, "could not get runtime") diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 4edc86361..95b7a06cf 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -25,7 +25,13 @@ var ( exitCode = 125 ) -var cmdsNotRequiringRootless = map[string]bool{"help": true, "version": true, "exec": true, "stop": true} +var cmdsNotRequiringRootless = map[string]bool{ + "help": true, + "version": true, + "exec": true, + "kill": true, + "stop": true, +} func main() { debug := false |