From 187de9f98ea0900db8bde408fc49cf9a7eeafb92 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 15 Apr 2019 13:00:54 +0200 Subject: cmd, pkg: drop commented code Signed-off-by: Giuseppe Scrivano --- cmd/podman/utils.go | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'cmd/podman/utils.go') 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) -// } -- cgit v1.2.3-54-g00ecf