mirror of
https://github.com/containers/podman
synced 2024-10-21 01:34:37 +00:00
Merge pull request #13061 from flouthoc/podman-vm-delegate-subsystem
ignition, machine: delegate `cpu,io,memory,pid cgroup controllers` to machine's non-root users.
This commit is contained in:
commit
c2f4747fea
|
@ -246,6 +246,10 @@ netns="bridge"
|
|||
`
|
||||
rootContainers := `[engine]
|
||||
machine_enabled=true
|
||||
`
|
||||
|
||||
delegateConf := `[Service]
|
||||
Delegate=memory pids cpu io
|
||||
`
|
||||
|
||||
// Add a fake systemd service to get the user socket rolling
|
||||
|
@ -280,6 +284,24 @@ machine_enabled=true
|
|||
Mode: intToPtr(0744),
|
||||
},
|
||||
})
|
||||
|
||||
// Set delegate.conf so cpu,io subsystem is delegated to non-root users as well for cgroupv2
|
||||
// by default
|
||||
files = append(files, File{
|
||||
Node: Node{
|
||||
Group: getNodeGrp("root"),
|
||||
Path: "/etc/systemd/system/user@.service.d/delegate.conf",
|
||||
User: getNodeUsr("root"),
|
||||
},
|
||||
FileEmbedded1: FileEmbedded1{
|
||||
Append: nil,
|
||||
Contents: Resource{
|
||||
Source: encodeDataURLPtr(delegateConf),
|
||||
},
|
||||
Mode: intToPtr(0644),
|
||||
},
|
||||
})
|
||||
|
||||
// Add a file into linger
|
||||
files = append(files, File{
|
||||
Node: Node{
|
||||
|
|
Loading…
Reference in a new issue