diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-07 22:21:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 22:21:36 +0200 |
| commit | 74dc9a45e3f85b4fc55a2d1cb2786885eb4489f5 (patch) | |
| tree | f27f5b26b4076fe8dd2dad3afde8407640c77807 /cmd | |
| parent | 2e40bdebfd245ff04e86b1ea42f663087d97fccf (diff) | |
| parent | bc7b1ca03da88473c10e59197becd812cf341663 (diff) | |
| download | podman-74dc9a45e3f85b4fc55a2d1cb2786885eb4489f5.tar.gz podman-74dc9a45e3f85b4fc55a2d1cb2786885eb4489f5.tar.bz2 podman-74dc9a45e3f85b4fc55a2d1cb2786885eb4489f5.zip | |
Merge pull request #2977 from baude/makeitrain
enable integration tests for remote-client
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/main_remote.go | 14 | ||||
| -rw-r--r-- | cmd/podman/varlink/io.podman.varlink | 5 |
2 files changed, 4 insertions, 15 deletions
diff --git a/cmd/podman/main_remote.go b/cmd/podman/main_remote.go index a3335050a..753730b56 100644 --- a/cmd/podman/main_remote.go +++ b/cmd/podman/main_remote.go @@ -3,10 +3,6 @@ package main import ( - "os" - - "github.com/containers/libpod/pkg/rootless" - "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) @@ -29,16 +25,6 @@ func profileOff(cmd *cobra.Command) error { } func setupRootless(cmd *cobra.Command, args []string) error { - if rootless.IsRootless() { - became, ret, err := rootless.BecomeRootInUserNS() - if err != nil { - logrus.Errorf(err.Error()) - os.Exit(1) - } - if became { - os.Exit(ret) - } - } return nil } diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink index ace81646c..faaecdb6b 100644 --- a/cmd/podman/varlink/io.podman.varlink +++ b/cmd/podman/varlink/io.podman.varlink @@ -1254,4 +1254,7 @@ error ErrorOccurred (reason: string) error RuntimeError (reason: string) # The Podman endpoint requires that you use a streaming connection. -error WantsMoreRequired (reason: string)
\ No newline at end of file +error WantsMoreRequired (reason: string) + +# Container is already stopped +error ErrCtrStopped (id: string) |