Merge pull request #20413 from Luap99/quadlet-cgroupv2

[CI:DOCS] quadlet: document cgroupv2 requirement
containers · Oct 19, 2023 · 85e8aa4 · 85e8aa4 · packit-as-a-service · Oct 19, 2023
2 parents 0b0f128 + f2bc638
commit 85e8aa4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docs/source/markdown/podman-systemd.unit.5.md b/docs/source/markdown/podman-systemd.unit.5.md
@@ -59,6 +59,8 @@ Adding the following snippet to a Quadlet file extends the systemd timeout to 15
 TimeoutStartSec=900
 ```
 
+Quadlet requires the use of cgroup v2, use `podman info --format {{.Host.CgroupsVersion}}` to check on the system.
+
 ### Service Type
 
 By default, the `Type` field of the `Service` section of the Quadlet file does not need to be set.

diff --git a/docs/tutorials/socket_activation.md b/docs/tutorials/socket_activation.md
@@ -76,7 +76,7 @@ stateDiagram-v2
     s2 --> container: socket inherited via exec
 ```
 
-This type of socket activation can be used in systemd services that are generated from container unit files (see [podman-systemd.unit(5)](https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html)) or from the command [`podman generate systemd`](https://docs.podman.io/en/latest/markdown/podman-generate-systemd.1.html).
+This type of socket activation can be used in systemd services that are generated from container unit files (see [podman-systemd.unit(5)](https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html)) (Note, quadlet requires the use of cgroup v2) or from the command [`podman generate systemd`](https://docs.podman.io/en/latest/markdown/podman-generate-systemd.1.html).
 The container must also support socket activation. Not all software daemons support socket activation
 but it's getting more popular. For instance Apache HTTP server, MariaDB, DBUS, PipeWire, Gunicorn, CUPS
 all have socket activation support.