Merge pull request #4018 from giuseppe/fix-error-message-rootless

rootless: report the correct error
containers · Sep 13, 2019 · 9b83882 · 9b83882
2 parents e8a44eb + 466694b
commit 9b83882
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cmd/podman/main_local.go b/cmd/podman/main_local.go
@@ -178,9 +178,9 @@ func setupRootless(cmd *cobra.Command, args []string) error {
 		if !ownsCgroup {
 			unitName := fmt.Sprintf("podman-%d.scope", os.Getpid())
 			if err := utils.RunUnderSystemdScope(os.Getpid(), "user.slice", unitName); err != nil {
-				conf, err := runtime.GetConfig()
-				if err != nil {
-					return err
+				conf, err2 := runtime.GetConfig()
+				if err2 != nil {
+					return err2
 				}
 				if conf.CgroupManager == libpod.SystemdCgroupsManager {
 					logrus.Warnf("Failed to add podman to systemd sandbox cgroup: %v", err)