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/pod_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/pod_kill.go')
-rw-r--r-- | cmd/podman/pod_kill.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmd/podman/pod_kill.go b/cmd/podman/pod_kill.go index c538674a4..ebd7db762 100644 --- a/cmd/podman/pod_kill.go +++ b/cmd/podman/pod_kill.go @@ -6,7 +6,6 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/pkg/adapter" - "github.com/containers/libpod/pkg/rootless" "github.com/docker/docker/pkg/signal" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -49,7 +48,6 @@ func init() { // podKillCmd kills one or more pods with a signal func podKillCmd(c *cliconfig.PodKillValues) error { - rootless.SetSkipStorageSetup(true) runtime, err := adapter.GetRuntime(&c.PodmanCommand) if err != nil { return errors.Wrapf(err, "could not get runtime") |