diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-04 09:14:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-04 09:14:15 -0500 |
| commit | 4ad9e0030bc20826f735cf4ec0d5ecc287647218 (patch) | |
| tree | 7d7bdaea0e8993075ff033f1545d8b8b6eadcffa /pkg/machine | |
| parent | 337f706f6118f2c91e9906afcdaa233f7cfdbaf9 (diff) | |
| parent | cad3eb78b4b17e7edec1fdec9ce8a948ab2819e1 (diff) | |
| download | podman-4ad9e0030bc20826f735cf4ec0d5ecc287647218.tar.gz podman-4ad9e0030bc20826f735cf4ec0d5ecc287647218.tar.bz2 podman-4ad9e0030bc20826f735cf4ec0d5ecc287647218.zip | |
Merge pull request #13133 from mheon/bump_400_rc4
Bump to v4.0.0-RC4
Diffstat (limited to 'pkg/machine')
| -rw-r--r-- | pkg/machine/ignition.go | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pkg/machine/ignition.go b/pkg/machine/ignition.go index ca6abd48c..206c9144f 100644 --- a/pkg/machine/ignition.go +++ b/pkg/machine/ignition.go @@ -248,6 +248,10 @@ netns="bridge" machine_enabled=true ` + delegateConf := `[Service] +Delegate=memory pids cpu io +` + // Add a fake systemd service to get the user socket rolling files = append(files, File{ Node: Node{ @@ -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{ |