mirror of
https://github.com/containers/podman.git
synced 2025-06-25 03:52:15 +08: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:
@ -246,6 +246,10 @@ netns="bridge"
|
|||||||
`
|
`
|
||||||
rootContainers := `[engine]
|
rootContainers := `[engine]
|
||||||
machine_enabled=true
|
machine_enabled=true
|
||||||
|
`
|
||||||
|
|
||||||
|
delegateConf := `[Service]
|
||||||
|
Delegate=memory pids cpu io
|
||||||
`
|
`
|
||||||
|
|
||||||
// Add a fake systemd service to get the user socket rolling
|
// Add a fake systemd service to get the user socket rolling
|
||||||
@ -280,6 +284,24 @@ machine_enabled=true
|
|||||||
Mode: intToPtr(0744),
|
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
|
// Add a file into linger
|
||||||
files = append(files, File{
|
files = append(files, File{
|
||||||
Node: Node{
|
Node: Node{
|
||||||
|
Reference in New Issue
Block a user