diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-19 10:59:43 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-04-01 13:24:04 +0200 |
| commit | ed326206f2b0ed80cdeddc63430bfbe60016c7df (patch) | |
| tree | 84d3430711744e68f1217d71ed8316337c366ef2 /cmd/podman/kill.go | |
| parent | cd35e20772a324e5dd247496705bef57b9da752d (diff) | |
| download | podman-ed326206f2b0ed80cdeddc63430bfbe60016c7df.tar.gz podman-ed326206f2b0ed80cdeddc63430bfbe60016c7df.tar.bz2 podman-ed326206f2b0ed80cdeddc63430bfbe60016c7df.zip | |
rootless: remove SkipStorageSetup()
in the few places where we care about skipping the storage
initialization, we can simply use the process effective UID, instead
of relying on a global boolean flag.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman/kill.go')
| -rw-r--r-- | cmd/podman/kill.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cmd/podman/kill.go b/cmd/podman/kill.go index 2c1e13eaf..6019fbfec 100644 --- a/cmd/podman/kill.go +++ b/cmd/podman/kill.go @@ -4,12 +4,10 @@ import ( "fmt" "reflect" - "github.com/containers/libpod/pkg/adapter" - "github.com/opentracing/opentracing-go" - "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/pkg/rootless" + "github.com/containers/libpod/pkg/adapter" "github.com/docker/docker/pkg/signal" + "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -63,7 +61,6 @@ func killCmd(c *cliconfig.KillValues) error { return err } - rootless.SetSkipStorageSetup(true) runtime, err := adapter.GetRuntime(&c.PodmanCommand) if err != nil { return errors.Wrapf(err, "could not get runtime") |