cmd, pkg: drop commented code

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

2 files changed, 0 insertions, 66 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)
-// }
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 (