containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18489 from bachradsusi/quadlets-precedence 

Fix preference of user quadlets directories
This commit is contained in:
OpenShift Merge Robot 2023-05-09 08:29:42 -04:00 committed by GitHub
parent edcb29b19f bdb3ed7950
commit 1a78a4e16f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/quadlet/main.go
View File

@ -115,13 +115,13 @@ func getUnitDirs(rootless bool) []string {
return nil return nil
} }
dirs = append(dirs, path.Join(configDir, "containers/systemd")) dirs = append(dirs, path.Join(configDir, "containers/systemd"))
dirs = append(dirs, filepath.Join(quadlet.UnitDirAdmin, "users"))
u, err := user.Current() u, err := user.Current()
if err != nil { if err == nil {
dirs = append(dirs, filepath.Join(quadlet.UnitDirAdmin, "users", u.Uid))
} else {
fmt.Fprintf(os.Stderr, "Warning: %v", err) fmt.Fprintf(os.Stderr, "Warning: %v", err)
return dirs
} }
return append(dirs, filepath.Join(quadlet.UnitDirAdmin, "users", u.Uid)) return append(dirs, filepath.Join(quadlet.UnitDirAdmin, "users"))
} }
dirs = append(dirs, quadlet.UnitDirAdmin) dirs = append(dirs, quadlet.UnitDirAdmin)
return append(dirs, quadlet.UnitDirDistro) return append(dirs, quadlet.UnitDirDistro)

2
cmd/quadlet/main_test.go
View File

@ -61,8 +61,8 @@ func TestUnitDirs(t *testing.T) {
rootlessDirs := []string{ rootlessDirs := []string{
path.Join(configDir, "containers/systemd"), path.Join(configDir, "containers/systemd"),
filepath.Join(quadlet.UnitDirAdmin, "users"),
filepath.Join(quadlet.UnitDirAdmin, "users", u.Uid), filepath.Join(quadlet.UnitDirAdmin, "users", u.Uid),
filepath.Join(quadlet.UnitDirAdmin, "users"),
} }
unitDirs = getUnitDirs(true) unitDirs = getUnitDirs(true)

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

@ -15,10 +15,9 @@ podman\-systemd.unit - systemd units using Podman Quadlet
### Podman user unit search path ### Podman user unit search path
* /etc/containers/systemd/users/ * $XDG_CONFIG_HOME/containers/systemd/ or ~/.config/containers/systemd/
* /etc/containers/systemd/users/$(UID) * /etc/containers/systemd/users/$(UID)
* $XDG_CONFIG_HOME/containers/systemd/ * /etc/containers/systemd/users/
* ~/.config/containers/systemd/
## DESCRIPTION ## DESCRIPTION