From 803cb6e3b9c0719add9a977e76ab3fadb78858f0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Mar 2007 22:04:25 +0000 Subject: [PATCH] * Override the setuid helper using NIX_SETUID_HELPER. --- doc/manual/troubleshooting.xml | 5 +++-- src/libstore/build.cc | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml index c0add7fdd..e1e6c08c8 100644 --- a/doc/manual/troubleshooting.xml +++ b/doc/manual/troubleshooting.xml @@ -43,8 +43,9 @@ Berkeley DB error: file validpaths (meta pgno = 0) has LSN [483][34721]. Berkeley DB error: end of log is [1][28] Berkeley DB error: /nix/var/nix/db/validpaths: unexpected file type or format -or other weird Berkeley DB errors, and they don’t away (i.e., -automatic recovery doesn’t work). This may be the case after a system crash. +or other weird Berkeley DB errors, and they don’t go away (i.e., +automatic recovery doesn’t work). This may be the case after a system +crash. Solution: first try to run db_recover and then nix-store diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 90ebeaa79..7009876f1 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -465,7 +465,8 @@ void UserLock::release() static void runSetuidHelper(const string & command, const string & arg) { - string program = nixLibexecDir + "/nix-setuid-helper"; + Path program = getEnv("NIX_SETUID_HELPER", + nixLibexecDir + "/nix-setuid-helper"); /* Fork. */ Pid pid;