maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert(tvix): "Disable sandboxing by default until its time comes"

Browse source 
This reverts commit a41c3dedb1.

Reason for revert: I believe its time has come.

Change-Id: I4133dc8a3b57b40b280646d1622ed7a0409c5246
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1941
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
This commit is contained in:
Griffin Smith 2020-08-31 23:03:26 -04:00 • committed by glittershark
parent 8b7dcfaeba
commit 053a98a7d7
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
third_party/nix/src/libstore/globals.hh vendored
View file

@ -243,14 +243,21 @@ class Settings : public Config {
this, false, "show-trace", this, false, "show-trace",
"Whether to show a stack trace on evaluation errors."}; "Whether to show a stack trace on evaluation errors."};
Setting<SandboxMode> sandboxMode{ Setting<SandboxMode> sandboxMode {
this, this,
// TODO(tazjin): Turn sandboxing back on once it is time. #if __linux__
smDisabled, smEnabled
"sandbox", #else
"Whether to enable sandboxed builds. Can be \"true\", \"false\" or " smDisabled
"\"relaxed\".", #endif
{"build-use-chroot", "build-use-sandbox"}}; ,
"sandbox",
"Whether to enable sandboxed builds. Can be \"true\", \"false\" or "
"\"relaxed\".",
{
"build-use-chroot", "build-use-sandbox"
}
};
Setting<PathSet> sandboxPaths{ Setting<PathSet> sandboxPaths{
this, this,