diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-09-27 14:17:41 +0200 |
|---|---|---|
| committer | Filipe Brandenburger <filbranden@gmail.com> | 2019-10-01 10:21:13 -0700 |
| commit | c78c095b1e6c87f309bbae5166f94d1bedc4ce81 (patch) | |
| tree | 3caa89ace60b585d4730748e2ba74d58d6333237 /docs/ENVIRONMENT.md | |
| parent | 490486842b6521104b594c511ca912504f61a8f3 (diff) | |
| download | systemd-c78c095b1e6c87f309bbae5166f94d1bedc4ce81.tar.gz | |
nspawn: rename UNIFIED_CGROUP_HIERARCHY to SYSTEMD_NSPAWN_UNIFIED_HIERARCHY
We should never have used an unprefixed environment variable name.
All other systemd-nspawn variables have the "SYSTEMD_NSPAWN_" prefix,
and all other systemd variables have the "SYSTEMD_" prefix.
The new variable name takes precedence, but we fall back to checking the
old one. If only the old one is found, a warning is emitted.
In addition, SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="" is accepted as an override
to avoid looking for the old variable name.
We have a variable with the same name ($UNIFIED_CGROUP_HIERARCHY) in tests,
which governs both systemd-nspawn and qemu behaviour. It is not renamed.
Diffstat (limited to 'docs/ENVIRONMENT.md')
| -rw-r--r-- | docs/ENVIRONMENT.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/ENVIRONMENT.md b/docs/ENVIRONMENT.md index 838cc7e4cf..c6a7f1babd 100644 --- a/docs/ENVIRONMENT.md +++ b/docs/ENVIRONMENT.md @@ -70,8 +70,8 @@ systemctl: systemd-nspawn: -* `$UNIFIED_CGROUP_HIERARCHY=1` — if set, force nspawn into unified cgroup - hierarchy mode. +* `$SYSTEMD_NSPAWN_UNIFIED_HIERARCHY=1` — if set, force nspawn into unified + cgroup hierarchy mode. * `$SYSTEMD_NSPAWN_API_VFS_WRITABLE=1` — if set, make /sys and /proc/sys and friends writable in the container. If set to "network", leave only |