diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-15 07:08:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-15 07:08:28 -0700 |
| commit | e5227919af5b13a56b057927da0bfbf185c29a74 (patch) | |
| tree | 46cee338efe059cd3c4f573e5fb5facdedc3dfbf /cmd/podman/shared/create.go | |
| parent | 6e1dab76e2282774d384ec3bc46e314e9b030595 (diff) | |
| parent | 187de9f98ea0900db8bde408fc49cf9a7eeafb92 (diff) | |
| download | podman-e5227919af5b13a56b057927da0bfbf185c29a74.tar.gz podman-e5227919af5b13a56b057927da0bfbf185c29a74.tar.bz2 podman-e5227919af5b13a56b057927da0bfbf185c29a74.zip | |
Merge pull request #2939 from giuseppe/rootless-fixes
rootless: cleanups
Diffstat (limited to 'cmd/podman/shared/create.go')
| -rw-r--r-- | cmd/podman/shared/create.go | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index a1c096853..3f54e193f 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -19,7 +19,6 @@ import ( ann "github.com/containers/libpod/pkg/annotations" "github.com/containers/libpod/pkg/inspect" ns "github.com/containers/libpod/pkg/namespaces" - "github.com/containers/libpod/pkg/rootless" cc "github.com/containers/libpod/pkg/spec" "github.com/containers/libpod/pkg/util" "github.com/docker/docker/pkg/signal" @@ -392,16 +391,6 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. } if c.IsSet("pod") { if strings.HasPrefix(originalPodName, "new:") { - if rootless.IsRootless() { - // To create a new pod, we must immediately create the userns. - became, ret, err := rootless.BecomeRootInUserNS() - if err != nil { - return nil, err - } - if became { - os.Exit(ret) - } - } // pod does not exist; lets make it var podOptions []libpod.PodCreateOption podOptions = append(podOptions, libpod.WithPodName(podName), libpod.WithInfraContainer(), libpod.WithPodCgroups()) |