summaryrefslogtreecommitdiff
path: root/cmd/podman/main.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-19 08:30:05 -0700
committerGitHub <noreply@github.com>2019-03-19 08:30:05 -0700
commita1299f506d9b93824fae737f0f68a19adaf2bde1 (patch)
treeff27a306055f4eb6a1b57455cd15d3c7fe6eccf9 /cmd/podman/main.go
parentac523cbe2b257e13c7b3b823c8de83e44052ffaf (diff)
parent4ac08d3aa1882851d4a03aa1e53c47c6fb173958 (diff)
downloadpodman-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/main.go')
-rw-r--r--cmd/podman/main.go38
1 files changed, 20 insertions, 18 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index ef300ef75..dd8b61408 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -67,24 +67,26 @@ var cmdsNotRequiringRootless = map[*cobra.Command]bool{
_exportCommand: true,
//// `info` must be executed in an user namespace.
//// If this change, please also update libpod.refreshRootless()
- _loginCommand: true,
- _logoutCommand: true,
- _mountCommand: true,
- _killCommand: true,
- _pauseCommand: true,
- _podRmCommand: true,
- _podKillCommand: true,
- _podStatsCommand: true,
- _podStopCommand: true,
- _podTopCommand: true,
- _restartCommand: true,
- _rmCommand: true,
- _runCommand: true,
- _unpauseCommand: true,
- _searchCommand: true,
- _statsCommand: true,
- _stopCommand: true,
- _topCommand: true,
+ _loginCommand: true,
+ _logoutCommand: true,
+ _mountCommand: true,
+ _killCommand: true,
+ _pauseCommand: true,
+ _podRmCommand: true,
+ _podKillCommand: true,
+ _podRestartCommand: true,
+ _podStatsCommand: true,
+ _podStopCommand: true,
+ _podTopCommand: true,
+ _restartCommand: true,
+ &_psCommand: true,
+ _rmCommand: true,
+ _runCommand: true,
+ _unpauseCommand: true,
+ _searchCommand: true,
+ _statsCommand: true,
+ _stopCommand: true,
+ _topCommand: true,
}
var rootCmd = &cobra.Command{