summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-04-15 12:58:24 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-04-15 12:59:46 +0200
commita09b6bf77dc015b6524b80082726d7103e312c25 (patch)
treec9e386a9fba520ad250560b2a892d264e2e44a0c
parentffd89994216741e452637f4aa797e616716f80cd (diff)
downloadpodman-a09b6bf77dc015b6524b80082726d7103e312c25.tar.gz
podman-a09b6bf77dc015b6524b80082726d7103e312c25.tar.bz2
podman-a09b6bf77dc015b6524b80082726d7103e312c25.zip
pod: drop dead code
we always create a user namespace now, so no need to check if we are running as non root. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--cmd/podman/shared/create.go11
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())