aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarwan Aljubeh <marwan.aljubeh@gmail.com>2020-09-21 17:29:08 +0100
committerMarwan Aljubeh <marwan.aljubeh@gmail.com>2020-09-21 17:29:08 +0100
commitf80ffeb8c9291f7168f098fdaadc15408492f3c2 (patch)
tree3362bfdcac7edd963e7337a9e5c1221066f75a8f /src
parent4e1a04733d5075fdc09dbc6767755d4487e96da7 (diff)
Update the variable name accordingly
Diffstat (limited to 'src')
-rw-r--r--src/libstore/globals.cc2
-rw-r--r--src/libstore/globals.hh2
-rw-r--r--src/libstore/local-store.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index ca2e75603..ff6082aac 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -41,7 +41,7 @@ Settings::Settings()
{
buildUsersGroup = getuid() == 0 ? "nixbld" : "";
lockCPU = getEnv("NIX_AFFINITY_HACK") == "1";
- ignoreSymlinkStore = getEnv("NIX_IGNORE_SYMLINK_STORE") == "1";
+ allowSymlinkedStore = getEnv("NIX_IGNORE_SYMLINK_STORE") == "1";
caFile = getEnv("NIX_SSL_CERT_FILE").value_or(getEnv("SSL_CERT_FILE").value_or(""));
if (caFile == "") {
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index fcb9b0f63..fd0c6cbcc 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -882,7 +882,7 @@ public:
Setting<std::string> flakeRegistry{this, "https://github.com/NixOS/flake-registry/raw/master/flake-registry.json", "flake-registry",
"Path or URI of the global flake registry."};
- Setting<bool> ignoreSymlinkStore{
+ Setting<bool> allowSymlinkedStore{
this, false, "allow-symlinked-store",
R"(
If set to `true`, Nix will stop complaining if the store directory
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 24b9ea7bd..cc9fcfe6e 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -109,7 +109,7 @@ LocalStore::LocalStore(const Params & params)
}
/* Ensure that the store and its parents are not symlinks. */
- if (!settings.ignoreSymlinkStore) {
+ if (!settings.allowSymlinkedStore) {
Path path = realStoreDir;
struct stat st;
while (path != "/") {