From 842e0e439a22081be1b4fed7ddc21d6d228afd10 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Fri, 25 Nov 2016 00:08:34 +0100 Subject: Simplify remouting with MS_PRIVATE in sandbox build also fix race condition if mounts are added after mountinfo is read. --- nix/libstore/build.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'nix') diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index 63540ddfc1..d68e8b2bc0 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -2086,12 +2086,8 @@ void DerivationGoal::runChild() outside of the namespace. Making a subtree private is local to the namespace, though, so setting MS_PRIVATE does not affect the outside world. */ - Strings mounts = tokenizeString(readFile("/proc/self/mountinfo", true), "\n"); - foreach (Strings::iterator, i, mounts) { - vector fields = tokenizeString >(*i, " "); - string fs = decodeOctalEscaped(fields.at(4)); - if (mount(0, fs.c_str(), 0, MS_PRIVATE, 0) == -1) - throw SysError(format("unable to make filesystem `%1%' private") % fs); + if (mount(0, "/", 0, MS_REC|MS_PRIVATE, 0) == -1) { + throw SysError("unable to make ‘/’ private mount"); } /* Bind-mount chroot directory to itself, to treat it as a -- cgit v1.2.3