diff options
| author | Florian Klink <flokli@flokli.de> | 2020-11-17 21:54:26 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-11-19 16:56:46 +0100 |
| commit | d22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c (patch) | |
| tree | 4019622d6149592c7c771ff05996b84386ce12ea /pkgs/os-specific/linux/systemd/default.nix | |
| parent | e949d758998fafbef608adcf9f54d79a6e7da4c8 (diff) | |
| download | nixpkgs-d22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c.tar nixpkgs-d22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c.tar.gz nixpkgs-d22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c.tar.bz2 nixpkgs-d22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c.tar.lz nixpkgs-d22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c.tar.xz nixpkgs-d22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c.tar.zst nixpkgs-d22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c.zip | |
systemd: switch to unified cgroup hierarchy by default
See https://www.redhat.com/sysadmin/fedora-31-control-group-v2 for details on why this is desirable, and how it impacts containers. Users that need to keep using the old cgroup hierarchy can re-enable it by setting `systemd.unifiedCgroupHierarchy` to `false`. Well-known candidates not supporting that hierarchy, like docker and hidepid=… will disable it automatically. Fixes #73800
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 85c78ce1421..084ac1da9af 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -281,9 +281,9 @@ stdenv.mkDerivation { "-Dmount-path=${utillinux}/bin/mount" "-Dumount-path=${utillinux}/bin/umount" "-Dcreate-log-dirs=false" - # Upstream uses cgroupsv2 by default. To support docker and other - # container managers we still need v1. - "-Ddefault-hierarchy=hybrid" + + # Use cgroupsv2. This is already the upstream default, but better be explicit. + "-Ddefault-hierarchy=unified" # Upstream defaulted to disable manpages since they optimize for the much # more frequent development builds "-Dman=true" |