opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-04 10:10:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25699 from johnschug/main

Browse Source 
quadlet: add support for the UpheldBy option in the Install section
This commit is contained in:
openshift-merge-bot[bot]
2025-03-28 12:43:42 +00:00
committed by GitHub
parent eb993814c1 a0cae65c13
commit d842b145f7
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/quadlet/main.go
View File

@ -449,6 +449,18 @@ func generateServiceFile(service *parser.UnitFile) error {
return nil return nil
} }
func gatherDependentSymlinks(service *parser.UnitFile, key, dir, filename string) []string {
symlinks := make([]string, 0)
groupBy := service.LookupAllStrv(quadlet.InstallGroup, key)
for _, groupByUnit := range groupBy {
// Only allow filenames, not paths
if !strings.Contains(groupByUnit, "/") {
symlinks = append(symlinks, fmt.Sprintf("%s.%s/%s", groupByUnit, dir, filename))
}
}
return symlinks
}
// This parses the `Install` group of the unit file and creates the required // This parses the `Install` group of the unit file and creates the required
// symlinks to get systemd to start the newly generated file as needed. // symlinks to get systemd to start the newly generated file as needed.
// In a traditional setup this is done by "systemctl enable", but that doesn't // In a traditional setup this is done by "systemctl enable", but that doesn't
@ -476,21 +488,9 @@ func enableServiceFile(outputPath string, service *parser.UnitFile) {
} }
if serviceFilename != "" { if serviceFilename != "" {
wantedBy := service.LookupAllStrv(quadlet.InstallGroup, "WantedBy") symlinks = append(symlinks, gatherDependentSymlinks(service, "WantedBy", "wants", serviceFilename)...)
for _, wantedByUnit := range wantedBy { symlinks = append(symlinks, gatherDependentSymlinks(service, "RequiredBy", "requires", serviceFilename)...)
// Only allow filenames, not paths symlinks = append(symlinks, gatherDependentSymlinks(service, "UpheldBy", "upholds", serviceFilename)...)
if !strings.Contains(wantedByUnit, "/") {
symlinks = append(symlinks, fmt.Sprintf("%s.wants/%s", wantedByUnit, serviceFilename))
}
}
requiredBy := service.LookupAllStrv(quadlet.InstallGroup, "RequiredBy")
for _, requiredByUnit := range requiredBy {
// Only allow filenames, not paths
if !strings.Contains(requiredByUnit, "/") {
symlinks = append(symlinks, fmt.Sprintf("%s.requires/%s", requiredByUnit, serviceFilename))
}
}
} }
for _, symlinkRel := range symlinks { for _, symlinkRel := range symlinks {

2
docs/source/markdown/podman-systemd.unit.5.md
View File

@ -129,7 +129,7 @@ For example, to start a container on boot, add something like this to the file:
WantedBy=default.target WantedBy=default.target
``` ```
Currently, only the `Alias`, `WantedBy` and `RequiredBy` keys are supported. Currently, only the `Alias`, `WantedBy`, `RequiredBy`, and `UpheldBy` keys are supported.
The Install section can be part of the main file, or it can be in a The Install section can be part of the main file, or it can be in a
separate drop-in file as described above. The latter allows you to separate drop-in file as described above. The latter allows you to

5
test/e2e/quadlet/install.container
View File

@ -7,6 +7,9 @@
## assert-symlink req1.service.requires/install.service ../install.service ## assert-symlink req1.service.requires/install.service ../install.service
## assert-symlink req2.service.requires/install.service ../install.service ## assert-symlink req2.service.requires/install.service ../install.service
## assert-symlink req3.service.requires/install.service ../install.service ## assert-symlink req3.service.requires/install.service ../install.service
## assert-symlink up1.service.upholds/install.service ../install.service
## assert-symlink up2.service.upholds/install.service ../install.service
## assert-symlink up3.service.upholds/install.service ../install.service
[Container] [Container]
Image=localhost/imagename Image=localhost/imagename
@ -19,3 +22,5 @@ WantedBy=want1.service want2.service
WantedBy=want3.service WantedBy=want3.service
RequiredBy=req1.service req2.service RequiredBy=req1.service req2.service
RequiredBy=req3.service RequiredBy=req3.service
UpheldBy=up1.service up2.service
UpheldBy=up3.service