diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index 0ea00ad265..eb2bdfa289 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -319,11 +319,9 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile handleLogDriver(container, ContainerGroup, podman) - // We use crun as the runtime and delegated groups to it + // We delegate groups to the runtime service.Add(ServiceGroup, "Delegate", "yes") - podman.add( - "--runtime", "crun", - "--cgroups=split") + podman.add("--cgroups=split") timezone, ok := container.Lookup(ContainerGroup, KeyTimezone) if ok && len(timezone) > 0 { diff --git a/test/e2e/quadlet/basepodman.container b/test/e2e/quadlet/basepodman.container index b37ca66f5b..1e2c34141a 100644 --- a/test/e2e/quadlet/basepodman.container +++ b/test/e2e/quadlet/basepodman.container @@ -1,4 +1,4 @@ -## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm --log-driver passthrough --runtime crun --cgroups=split --sdnotify=conmon -d localhost/imagename +## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm --log-driver passthrough --cgroups=split --sdnotify=conmon -d localhost/imagename [Container] Image=localhost/imagename diff --git a/test/e2e/quadlet/basic.container b/test/e2e/quadlet/basic.container index 21203179d6..de6f2ac087 100644 --- a/test/e2e/quadlet/basic.container +++ b/test/e2e/quadlet/basic.container @@ -5,7 +5,6 @@ ## assert-podman-args "--replace" ## assert-podman-args "-d" ## assert-podman-args "--log-driver" "passthrough" -## assert-podman-args "--runtime" "crun" ## assert-podman-args "--cgroups=split" ## assert-podman-args "--sdnotify=conmon" ## assert-key-is "Unit" "RequiresMountsFor" "%t/containers"