mirror of
https://github.com/opencontainers/runc.git
synced 2026-11-06 05:17:05 +00:00
Kir Kolyshkin
e4b70657ec
Add a new --cgroup-manager global option, accepting either "cgroupfs" (the default) or "systemd". It is compatible with the option of the same name crun has (except crun also has "disabled"). This helps tools which run either runc or crun, for example, crun's test suite, which can now be run against runc. Deprecate --systemd-cgroup in favor of --cgroup-manager=systemd. It is still supported (and there are no plans to remove it), but conflicts with --cgroup-manager set to anything other than systemd. Switch the integration tests to use the new option, and add a few tests for the new and the deprecated option. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
18 lines
549 B
Bash
Executable File
18 lines
549 B
Bash
Executable File
#!/bin/bash
|
|
# Wrapper for the runc binary under test.
|
|
#
|
|
# It adds the flags every test invocation needs, and, unlike a shell function,
|
|
# can be used from bats' run helper, as well as after commands that require a
|
|
# real binary, such as taskset or timeout.
|
|
#
|
|
# The directory containing this script is prepended to PATH by helpers.bash,
|
|
# which also exports the variables used below.
|
|
|
|
set -u -e
|
|
|
|
opts=()
|
|
[ -v RUNC_USE_SYSTEMD ] && opts+=("--cgroup-manager=systemd")
|
|
[ -n "${ROOT:-}" ] && opts+=("--root" "$ROOT/state")
|
|
|
|
exec "$RUNC" "${opts[@]}" "$@"
|