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 /pkg/adapter/runtime.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 'pkg/adapter/runtime.go')
| -rw-r--r-- | pkg/adapter/runtime.go | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go index 6aafed550..b5ec9f7a9 100644 --- a/pkg/adapter/runtime.go +++ b/pkg/adapter/runtime.go @@ -311,46 +311,6 @@ func (r *LocalRuntime) HealthCheck(c *cliconfig.HealthCheckValues) (libpod.Healt return r.Runtime.HealthCheck(c.InputArgs[0]) } -// JoinOrCreateRootlessPod joins the specified pod if it is running or it creates a new user namespace -// if the pod is stopped -// func (r *LocalRuntime) JoinOrCreateRootlessPod(pod *Pod) (bool, int, error) { -// if os.Geteuid() == 0 { -// return false, 0, nil -// } -// opts := rootless.Opts{ -// Argument: pod.ID(), -// } -// -// inspect, err := pod.Inspect() -// if err != nil { -// return false, 0, err -// } -// for _, ctr := range inspect.Containers { -// prevCtr, err := r.LookupContainer(ctr.ID) -// if err != nil { -// return false, -1, err -// } -// s, err := prevCtr.State() -// if err != nil { -// return false, -1, err -// } -// if s != libpod.ContainerStateRunning && s != libpod.ContainerStatePaused { -// continue -// } -// data, err := ioutil.ReadFile(prevCtr.Config().ConmonPidFile) -// if err != nil { -// return false, -1, errors.Wrapf(err, "cannot read conmon PID file %q", prevCtr.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) -// } - // Events is a wrapper to libpod to obtain libpod/podman events func (r *LocalRuntime) Events(c *cliconfig.EventValues) error { var ( |