aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/globals.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2022-11-08 16:03:42 +0100
committerEelco Dolstra <edolstra@gmail.com>2022-11-08 16:03:42 +0100
commit2fde7e0108d70bcba64ebecc5e5c7ee2863e3446 (patch)
tree3cf91ee071ba96dbca851a695838ea2099ec0c96 /src/libstore/globals.cc
parent40911d7dec75541a400fe8f556d4c70a7f845fac (diff)
Split auto UID allocation from cgroups
Cgroups are now only used for derivations that require the uid-range range feature. This allows auto UID allocation even on systems that don't have cgroups (like macOS). Also, make things work on modern systems that use cgroups v2 (where there is a single hierarchy and no "systemd" controller).
Diffstat (limited to 'src/libstore/globals.cc')
-rw-r--r--src/libstore/globals.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index ff658c428..b7f55cae7 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -131,6 +131,10 @@ StringSet Settings::getDefaultSystemFeatures()
StringSet features{"nixos-test", "benchmark", "big-parallel"};
#if __linux__
+ features.insert("uid-range");
+ #endif
+
+ #if __linux__
if (access("/dev/kvm", R_OK | W_OK) == 0)
features.insert("kvm");
#endif