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

Fix rootless detection error for pause & unpause

Browse Source 
Previously, when pause & unpause were run on rootless, the error message that pause was unsupported for rootless was not being thrown. When running remote, even if remote host was root, unsupported rootless error was being thrown.

Now, the error shows up when appropriate.

Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
This commit is contained in:
Ashley Cui
2019-07-02 14:26:11 -04:00
parent 26d02e9739
commit a704be59e5
2 changed files with 4 additions and 6 deletions

5
cmd/podman/pause.go

@ -1,11 +1,10 @@
package main package main
import ( import (
"os"
"github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/adapter" "github.com/containers/libpod/pkg/adapter"
"github.com/containers/libpod/pkg/rootless"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -39,7 +38,7 @@ func init() {
} }
func pauseCmd(c *cliconfig.PauseValues) error { func pauseCmd(c *cliconfig.PauseValues) error {
if os.Geteuid() != 0 { if rootless.IsRootless() && !remoteclient {
return errors.New("pause is not supported for rootless containers") return errors.New("pause is not supported for rootless containers")
} }

5
cmd/podman/unpause.go

@ -1,11 +1,10 @@
package main package main
import ( import (
"os"
"github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/adapter" "github.com/containers/libpod/pkg/adapter"
"github.com/containers/libpod/pkg/rootless"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -38,7 +37,7 @@ func init() {
} }
func unpauseCmd(c *cliconfig.UnpauseValues) error { func unpauseCmd(c *cliconfig.UnpauseValues) error {
if os.Geteuid() != 0 { if rootless.IsRootless() && !remoteclient {
return errors.New("unpause is not supported for rootless containers") return errors.New("unpause is not supported for rootless containers")
} }