Merge branch 'master' into feature/issue-8945

Signed-off-by: Stuart Shelton <[email protected]>
containers · Jan 13, 2021 · a236770 · a236770
2 parents a6af56f + f52a9ee
commit a236770
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go
@@ -172,7 +172,7 @@ WantedBy=multi-user.target default.target
 				ServiceName:      "pod-123abc",
 				InfraNameOrID:    "jadda-jadda-infra",
 				RestartPolicy:    "always",
-				PIDFile:          "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
 				StopTimeout:      42,
 				PodmanVersion:    "CI",
 				RequiredServices: []string{"container-1", "container-2"},
@@ -204,7 +204,7 @@ WantedBy=multi-user.target default.target
 				ServiceName:      "pod-123abc",
 				InfraNameOrID:    "jadda-jadda-infra",
 				RestartPolicy:    "on-failure",
-				PIDFile:          "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
 				StopTimeout:      10,
 				PodmanVersion:    "CI",
 				RequiredServices: []string{"container-1", "container-2"},
@@ -220,7 +220,7 @@ WantedBy=multi-user.target default.target
 				ServiceName:      "pod-123abc",
 				InfraNameOrID:    "jadda-jadda-infra",
 				RestartPolicy:    "on-failure",
-				PIDFile:          "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
 				StopTimeout:      10,
 				PodmanVersion:    "CI",
 				RequiredServices: []string{"container-1", "container-2"},