aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/gc.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-04-20 19:11:45 +0200
committerEelco Dolstra <edolstra@gmail.com>2017-04-20 19:11:45 +0200
commit749696e71c9d637a36ab09a1368dff01b2b1bda8 (patch)
tree9eda8ac38cf43f332bbb6f4b8a753b0b7fffd2e8 /src/libstore/gc.cc
parentefa4bdbfcd1489527bcf6f20a49c9a3bca8bbf6b (diff)
Detect lsof
Also, don't use lsof on Linux since it's not needed. Fixes #1328.
Diffstat (limited to 'src/libstore/gc.cc')
-rw-r--r--src/libstore/gc.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index 0b03d61a7..b6d462d2b 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -426,22 +426,27 @@ void LocalStore::findRuntimeRoots(PathSet & roots)
throw SysError("iterating /proc");
}
+#if !defined(__linux__)
try {
- auto lsofRegex = std::regex(R"(^n(/.*)$)");
+ printError("RUN LSOF %s", LSOF);
+ std::regex lsofRegex(R"(^n(/.*)$)");
auto lsofLines =
- tokenizeString<std::vector<string>>(runProgram("lsof", true, { "-n", "-w", "-F", "n" }), "\n");
+ tokenizeString<std::vector<string>>(runProgram(LSOF, true, { "-n", "-w", "-F", "n" }), "\n");
for (const auto & line : lsofLines) {
- auto match = std::smatch{};
+ std::smatch match;
if (std::regex_match(line, match, lsofRegex))
paths.emplace(match[1]);
}
} catch (ExecError & e) {
/* lsof not installed, lsof failed */
}
+#endif
+#if defined(__linux__)
readFileRoots("/proc/sys/kernel/modprobe", paths);
readFileRoots("/proc/sys/kernel/fbsplash", paths);
readFileRoots("/proc/sys/kernel/poweroff_cmd", paths);
+#endif
for (auto & i : paths)
if (isInStore(i)) {