diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-11 10:01:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 10:01:25 -0700 |
| commit | 6421208e0f6ff1fba58eafdab12e897b5ed12e3b (patch) | |
| tree | d2a44ec8b92d343d675027f524738875191027d8 /cmd/podman/main.go | |
| parent | f5afe88098d8825ea63ccb63875d48edab0eb111 (diff) | |
| parent | 231129e4dc083d9f63cf1876cc1695f7f8c03f25 (diff) | |
| download | podman-6421208e0f6ff1fba58eafdab12e897b5ed12e3b.tar.gz podman-6421208e0f6ff1fba58eafdab12e897b5ed12e3b.tar.bz2 podman-6421208e0f6ff1fba58eafdab12e897b5ed12e3b.zip | |
Merge pull request #2583 from giuseppe/rootless-fix-pod-rm
rootless: fix stop and rm when the container is running with uid != 0
Diffstat (limited to 'cmd/podman/main.go')
| -rw-r--r-- | cmd/podman/main.go | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 3571f526e..bbeb72397 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -65,18 +65,23 @@ 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, - _restartCommand: 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, + _podStatsCommand: true, + _podStopCommand: true, + _restartCommand: true, + _rmCommand: true, + _runCommand: true, + _unpauseCommand: true, + _searchCommand: true, + _statsCommand: true, + _stopCommand: true, + _topCommand: true, } var rootCmd = &cobra.Command{ |