opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-17 06:57:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmd, pkg: drop commented code

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-04-15 13:00:54 +02:00
parent a09b6bf77d
commit 187de9f98e
2 changed files with 0 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/podman/utils.go
View File

@ -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)
// }

40
pkg/adapter/runtime.go
View File

@ -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 (