mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build-remote: Put current load under the store state directory

Browse source 
Fixes the error

  error: opening lock file '/nix/var/nix/current-load/main-lock': Permission denied

when using a chroot store.
This commit is contained in:
Eelco Dolstra 2017-10-23 19:06:55 +02:00
parent f31c66d392
commit 863a45f1f3
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/build-remote/build-remote.cc
View file

@ -16,6 +16,7 @@
#include "serialise.hh" #include "serialise.hh"
#include "store-api.hh" #include "store-api.hh"
#include "derivations.hh" #include "derivations.hh"
#include "local-store.hh"
using namespace nix; using namespace nix;
using std::cin; using std::cin;
@ -48,7 +49,7 @@ int main (int argc, char * * argv)
if (argc != 6) if (argc != 6)
throw UsageError("called without required arguments"); throw UsageError("called without required arguments");
auto store = openStore(); auto store = openStore().cast<LocalStore>();
auto localSystem = argv[1]; auto localSystem = argv[1];
settings.maxSilentTime = std::stoll(argv[2]); settings.maxSilentTime = std::stoll(argv[2]);
@ -58,7 +59,7 @@ int main (int argc, char * * argv)
/* It would be more appropriate to use $XDG_RUNTIME_DIR, since /* It would be more appropriate to use $XDG_RUNTIME_DIR, since
that gets cleared on reboot, but it wouldn't work on macOS. */ that gets cleared on reboot, but it wouldn't work on macOS. */
currentLoad = settings.nixStateDir + "/current-load"; currentLoad = store->stateDir + "/current-load";
std::shared_ptr<Store> sshStore; std::shared_ptr<Store> sshStore;
AutoCloseFD bestSlotLock; AutoCloseFD bestSlotLock;