Permalink
Browse files

Enable sandboxing by default

Closes #179.
  • Loading branch information...
edolstra committed Nov 7, 2018
1 parent 5a3f140 commit 812e39313c2bcf8909b83e1e8bc548a85dcd626c
@@ -12,6 +12,7 @@
</partintro>
-->
<xi:include href="rl-2.3.xml" />
<xi:include href="rl-2.2.xml" />
<xi:include href="rl-2.1.xml" />
<xi:include href="rl-2.0.xml" />
@@ -0,0 +1,19 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ssec-relnotes-2.3">
<title>Release 2.3 (2019-??-??)</title>
<para>This release has the following changes:</para>
<itemizedlist>
<listitem>
<para>Sandbox builds are now enabled by default on Linux.</para>
</listitem>
</itemizedlist>
</section>
@@ -195,7 +195,13 @@ public:
Setting<bool> showTrace{this, false, "show-trace",
"Whether to show a stack trace on evaluation errors."};
Setting<SandboxMode> sandboxMode{this, smDisabled, "sandbox",
Setting<SandboxMode> sandboxMode{this,
#if __linux__
smEnabled
#else
smDisabled
#endif
, "sandbox",
"Whether to enable sandboxed builds. Can be \"true\", \"false\" or \"relaxed\".",
{"build-use-chroot", "build-use-sandbox"}};
@@ -85,16 +85,13 @@ killDaemon() {
trap "" EXIT
}
canUseSandbox() {
if [[ $(uname) != Linux ]]; then return 1; fi
if [ ! -L /proc/self/ns/user ]; then
echo "Kernel doesn't support user namespaces, skipping this test..."
return 1
fi
if [[ $(uname) == Linux ]] && [[ -L /proc/self/ns/user ]] && unshare --user true; then
_canUseSandbox=1
fi
if ! unshare --user true ; then
echo "Unprivileged user namespaces disabled by sysctl, skipping this test..."
canUseSandbox() {
if [[ ! $_canUseSandbox ]]; then
echo "Sandboxing not supported, skipping this test..."
return 1
fi
@@ -16,6 +16,7 @@ mkdir "$NIX_CONF_DIR"
cat > "$NIX_CONF_DIR"/nix.conf <<EOF
build-users-group =
keep-derivations = false
sandbox = false
include nix.conf.extra
EOF

1 comment on commit 812e393

@copumpkin

This comment has been minimized.

Member

copumpkin commented on 812e393 Nov 7, 2018

Holy shit!

Now I'm extra motivated to take that conditional out 😄

Please sign in to comment.