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/utils.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/utils.go')
| -rw-r--r-- | cmd/podman/utils.go | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go index 81bd02faa..986db469e 100644 --- a/cmd/podman/utils.go +++ b/cmd/podman/utils.go @@ -51,29 +51,3 @@ func markFlagHiddenForRemoteClient(flagName string, flags *pflag.FlagSet) { flags.MarkHidden(flagName) } } - -// TODO: remove when adapter package takes over this functionality -// func joinContainerOrCreateRootlessUserNS(runtime *libpod.Runtime, ctr *libpod.Container) (bool, int, error) { -// if os.Geteuid() == 0 { -// return false, 0, nil -// } -// s, err := ctr.State() -// if err != nil { -// return false, -1, err -// } -// opts := rootless.Opts{ -// Argument: ctr.ID(), -// } -// if s == libpod.ContainerStateRunning || s == libpod.ContainerStatePaused { -// data, err := ioutil.ReadFile(ctr.Config().ConmonPidFile) -// if err != nil { -// return false, -1, errors.Wrapf(err, "cannot read conmon PID file %q", ctr.Config().ConmonPidFile) -// } -// conmonPid, err := strconv.Atoi(string(data)) -// if err != nil { -// return false, -1, errors.Wrapf(err, "cannot parse PID %q", data) -// } -// return rootless.JoinDirectUserAndMountNSWithOpts(uint(conmonPid), &opts) -// } -// return rootless.BecomeRootInUserNSWithOpts(&opts) -// } |