diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-19 08:30:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 08:30:05 -0700 |
| commit | a1299f506d9b93824fae737f0f68a19adaf2bde1 (patch) | |
| tree | ff27a306055f4eb6a1b57455cd15d3c7fe6eccf9 /cmd/podman/pod_restart.go | |
| parent | ac523cbe2b257e13c7b3b823c8de83e44052ffaf (diff) | |
| parent | 4ac08d3aa1882851d4a03aa1e53c47c6fb173958 (diff) | |
| download | podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.gz podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.bz2 podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.zip | |
Merge pull request #2704 from giuseppe/fix-some-rootless
tests: fix rootless tests
Diffstat (limited to 'cmd/podman/pod_restart.go')
| -rw-r--r-- | cmd/podman/pod_restart.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/cmd/podman/pod_restart.go b/cmd/podman/pod_restart.go index 0765b98db..9c8d28424 100644 --- a/cmd/podman/pod_restart.go +++ b/cmd/podman/pod_restart.go @@ -2,9 +2,11 @@ package main import ( "fmt" + "os" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/pkg/adapter" + "github.com/containers/libpod/pkg/rootless" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -46,12 +48,24 @@ func init() { func podRestartCmd(c *cliconfig.PodRestartValues) error { var lastError error + if os.Geteuid() != 0 { + rootless.SetSkipStorageSetup(true) + } runtime, err := adapter.GetRuntime(&c.PodmanCommand) if err != nil { return errors.Wrapf(err, "could not get runtime") } defer runtime.Shutdown(false) + if rootless.IsRootless() { + var err error + + c.InputArgs, c.All, c.Latest, err = joinPodNS(runtime, c.All, c.Latest, c.InputArgs) + if err != nil { + return err + } + } + restartIDs, conErrors, restartErrors := runtime.RestartPods(getContext(), c) for _, p := range restartIDs { |