opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 21:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16713 from alexlarsson/quadlet-drop-cid-remove

Browse Source 
quadlet: Drop ExecStartPre=rm %t/%N.cid
This commit is contained in:
OpenShift Merge Robot
2022-12-06 09:00:57 -05:00
committed by GitHub
parent 53357b0f95 f3c5b0f9d1
commit 293f1cd14d
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/systemd/quadlet/quadlet.go
View File

@ -223,11 +223,6 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile
// Need the containers filesystem mounted to start podman // Need the containers filesystem mounted to start podman
service.Add(UnitGroup, "RequiresMountsFor", "%t/containers") service.Add(UnitGroup, "RequiresMountsFor", "%t/containers")
// Remove any leftover cid file before starting, just to be sure.
// We remove any actual pre-existing container by name with --replace=true.
// But --cidfile will fail if the target exists.
service.Add(ServiceGroup, "ExecStartPre", "-rm -f %t/%N.cid")
// If the conman exited uncleanly it may not have removed the container, so force it, // If the conman exited uncleanly it may not have removed the container, so force it,
// -i makes it ignore non-existing files. // -i makes it ignore non-existing files.
service.Add(ServiceGroup, "ExecStopPost", "-/usr/bin/podman rm -f -i --cidfile=%t/%N.cid") service.Add(ServiceGroup, "ExecStopPost", "-/usr/bin/podman rm -f -i --cidfile=%t/%N.cid")

1
test/e2e/quadlet/basic.container
View File

@ -14,7 +14,6 @@
## assert-key-is "Service" "Type" "notify" ## assert-key-is "Service" "Type" "notify"
## assert-key-is "Service" "NotifyAccess" "all" ## assert-key-is "Service" "NotifyAccess" "all"
## assert-key-is "Service" "SyslogIdentifier" "%N" ## assert-key-is "Service" "SyslogIdentifier" "%N"
## assert-key-is "Service" "ExecStartPre" "-rm -f %t/%N.cid"
## assert-key-is "Service" "ExecStopPost" "-/usr/bin/podman rm -f -i --cidfile=%t/%N.cid" "-rm -f %t/%N.cid" ## assert-key-is "Service" "ExecStopPost" "-/usr/bin/podman rm -f -i --cidfile=%t/%N.cid" "-rm -f %t/%N.cid"
## assert-key-is "Service" "Environment" "PODMAN_SYSTEMD_UNIT=%n" ## assert-key-is "Service" "Environment" "PODMAN_SYSTEMD_UNIT=%n"