diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-30 17:50:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 17:50:06 +0200 |
| commit | 95d9a1e667cc32209cbc6ed80fd7cf3cc2527309 (patch) | |
| tree | add3ea59709b740376a50ccc96225588d3407e20 /cmd/podman | |
| parent | c77a57ff2c92f6ae5e8551b687f14884ade6e723 (diff) | |
| parent | f59c94892832b95d5d912b00dd4416572ece5004 (diff) | |
| download | podman-95d9a1e667cc32209cbc6ed80fd7cf3cc2527309.tar.gz podman-95d9a1e667cc32209cbc6ed80fd7cf3cc2527309.tar.bz2 podman-95d9a1e667cc32209cbc6ed80fd7cf3cc2527309.zip | |
Merge pull request #5664 from giuseppe/rootless-make-error-not-fatal
rootless: make cgroup ownership detection not fatal
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/main_local.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/main_local.go b/cmd/podman/main_local.go index b03c7de44..23b3f5ae7 100644 --- a/cmd/podman/main_local.go +++ b/cmd/podman/main_local.go @@ -174,13 +174,13 @@ func setupRootless(cmd *cobra.Command, args []string) error { if os.Geteuid() == 0 { ownsCgroup, err := cgroups.UserOwnsCurrentSystemdCgroup() if err != nil { - return err - } - conf, err := runtime.GetConfig() - if err != nil { - return err + logrus.Warnf("Failed to detect the owner for the current cgroup: %v", err) } if !ownsCgroup { + conf, err := runtime.GetConfig() + if err != nil { + return err + } unitName := fmt.Sprintf("podman-%d.scope", os.Getpid()) if err := utils.RunUnderSystemdScope(os.Getpid(), "user.slice", unitName); err != nil { if conf.Engine.CgroupManager == config.SystemdCgroupsManager { |