aleksanaa/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Only do the auto chroot store on Linux

Browse source
This commit is contained in:
Eelco Dolstra 2022-06-24 23:35:21 +02:00
parent 1cb376d60e
commit 30d4aa5dd6
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/store-api.cc
View file

@ -1320,6 +1320,7 @@ std::shared_ptr<Store> openFromNonUri(const std::string & uri, const Store::Para
return std::make_shared<LocalStore>(params); return std::make_shared<LocalStore>(params);
else if (pathExists(settings.nixDaemonSocketFile)) else if (pathExists(settings.nixDaemonSocketFile))
return std::make_shared<UDSRemoteStore>(params); return std::make_shared<UDSRemoteStore>(params);
#if __linux__
else if (!pathExists(stateDir) && params.empty() && getuid() != 0) { else if (!pathExists(stateDir) && params.empty() && getuid() != 0) {
/* If /nix doesn't exist, there is no daemon socket, and /* If /nix doesn't exist, there is no daemon socket, and
we're not root, then automatically set up a chroot we're not root, then automatically set up a chroot
@ -1332,7 +1333,9 @@ std::shared_ptr<Store> openFromNonUri(const std::string & uri, const Store::Para
Store::Params params2; Store::Params params2;
params2["root"] = chrootStore; params2["root"] = chrootStore;
return std::make_shared<LocalStore>(params2); return std::make_shared<LocalStore>(params2);
} else }
#endif
else
return std::make_shared<LocalStore>(params); return std::make_shared<LocalStore>(params);
} else if (uri == "daemon") { } else if (uri == "daemon") {
return std::make_shared<UDSRemoteStore>(params); return std::make_shared<UDSRemoteStore>(params);