diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-22 02:02:34 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-22 02:02:34 -0700 |
commit | 54b901fdda9b4ad21d866a12e3e13567d7f8a908 (patch) | |
tree | 04ffcf5979fc8261e40d780843906efde7f9065b /cmd/podman/utils.go | |
parent | 68e3df37248da85f58662c00e0934d1359f0fdc0 (diff) | |
parent | 7f6f2f3f4a764f8e566752e61092254bd285424b (diff) | |
download | podman-54b901fdda9b4ad21d866a12e3e13567d7f8a908.tar.gz podman-54b901fdda9b4ad21d866a12e3e13567d7f8a908.tar.bz2 podman-54b901fdda9b4ad21d866a12e3e13567d7f8a908.zip |
Merge pull request #2716 from giuseppe/fix-volumes-userns
userns: mount the volumes from the intermediate namespace
Diffstat (limited to 'cmd/podman/utils.go')
-rw-r--r-- | cmd/podman/utils.go | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go index 4ec0f8a13..45d081512 100644 --- a/cmd/podman/utils.go +++ b/cmd/podman/utils.go @@ -200,35 +200,6 @@ func getPodsFromContext(c *cliconfig.PodmanCommand, r *libpod.Runtime) ([]*libpo return pods, lastError } -func getVolumesFromContext(c *cliconfig.PodmanCommand, r *libpod.Runtime) ([]*libpod.Volume, error) { - args := c.InputArgs - var ( - vols []*libpod.Volume - lastError error - err error - ) - - if c.Bool("all") { - vols, err = r.Volumes() - if err != nil { - return nil, errors.Wrapf(err, "unable to get all volumes") - } - } - - for _, i := range args { - vol, err := r.GetVolume(i) - if err != nil { - if lastError != nil { - logrus.Errorf("%q", lastError) - } - lastError = errors.Wrapf(err, "unable to find volume %s", i) - continue - } - vols = append(vols, vol) - } - return vols, lastError -} - //printParallelOutput takes the map of parallel worker results and outputs them // to stdout func printParallelOutput(m map[string]error, errCount int) error { |