summaryrefslogtreecommitdiff
path: root/cmd/podman/main.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-07-13 14:15:54 -0400
committerGitHub <noreply@github.com>2018-07-13 14:15:54 -0400
commit673465a7475f2c4ed6bfe06c481ecc99a2510c30 (patch)
tree9552b4b7e5956fbb798bf9d77820c7d30035a8c3 /cmd/podman/main.go
parent827359c8e6b116b839a95460cc1775a11f84b682 (diff)
parent62e48e5b71abe3002361bbf018961f8031fba03e (diff)
downloadpodman-673465a7475f2c4ed6bfe06c481ecc99a2510c30.tar.gz
podman-673465a7475f2c4ed6bfe06c481ecc99a2510c30.tar.bz2
podman-673465a7475f2c4ed6bfe06c481ecc99a2510c30.zip
Merge pull request #1075 from giuseppe/rootless-no-symlinks-into-storage-path
rootless: fix usage on Fedora Silverblue/CoreOS
Diffstat (limited to 'cmd/podman/main.go')
-rw-r--r--cmd/podman/main.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index a83dc5fb4..3dbf196c2 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -29,13 +29,13 @@ func main() {
debug := false
cpuProfile := false
- became, err := rootless.BecomeRootInUserNS()
+ became, ret, err := rootless.BecomeRootInUserNS()
if err != nil {
logrus.Errorf(err.Error())
os.Exit(1)
}
if became {
- os.Exit(0)
+ os.Exit(ret)
}
if reexec.Init() {