summaryrefslogtreecommitdiff
path: root/cmd/podman/main.go
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-08-28 08:43:48 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-28 11:25:01 +0000
commit660bb0196ca0e8e8e10d45f9a781c0bbc3b7c5dd (patch)
tree95a0c63129d7635d43fd515d81bb1db33f995b6b /cmd/podman/main.go
parentff4c7a068add2b0a910d2e7f3d442a5c93586e98 (diff)
downloadpodman-660bb0196ca0e8e8e10d45f9a781c0bbc3b7c5dd.tar.gz
podman-660bb0196ca0e8e8e10d45f9a781c0bbc3b7c5dd.tar.bz2
podman-660bb0196ca0e8e8e10d45f9a781c0bbc3b7c5dd.zip
rootless, kill: do not create a new userns
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #1360 Approved by: vrothberg
Diffstat (limited to 'cmd/podman/main.go')
-rw-r--r--cmd/podman/main.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 4edc86361..95b7a06cf 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -25,7 +25,13 @@ var (
exitCode = 125
)
-var cmdsNotRequiringRootless = map[string]bool{"help": true, "version": true, "exec": true, "stop": true}
+var cmdsNotRequiringRootless = map[string]bool{
+ "help": true,
+ "version": true,
+ "exec": true,
+ "kill": true,
+ "stop": true,
+}
func main() {
debug := false