diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-04 09:21:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 09:21:09 -0700 |
| commit | 1759eb09e1c13bc8392d515d69ca93226d067c73 (patch) | |
| tree | c769a191ec8cfb779a76ebcbc2e8638dbd56f549 /cmd/podman/kill.go | |
| parent | 71555a9ea015ebc1bf872a502d254e0b903ffcb4 (diff) | |
| parent | 72382a12a7b5ac85e53474dfd6dcd83cd64a2738 (diff) | |
| download | podman-1759eb09e1c13bc8392d515d69ca93226d067c73.tar.gz podman-1759eb09e1c13bc8392d515d69ca93226d067c73.tar.bz2 podman-1759eb09e1c13bc8392d515d69ca93226d067c73.zip | |
Merge pull request #2706 from giuseppe/rootless-single-usernamespace
rootless: single user namespace
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") |