aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-04-07 13:21:26 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-04-07 13:21:26 +0200
commit1711679ea5fd6a37db5a7a1b40eba1f58ad6c999 (patch)
tree62cc2bbe086f590eb9735cfe612d024b09c1139c /src
parentafa433e58c3fe6029660a43fdc2073c9d15b4210 (diff)
Revert /nix/store permission back to 01775
This broke NixOS VM tests. Mostly reverts 27b7b94923d2f207781b438bb7a57669bddf7d2b, 5ce50cd99e740d0d0f18c30327ae687be9356553, afa433e58c3fe6029660a43fdc2073c9d15b4210.
Diffstat (limited to 'src')
-rw-r--r--src/libstore/build.cc2
-rw-r--r--src/libstore/local-store.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index d768d4429..1fc5d4181 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1895,7 +1895,7 @@ void DerivationGoal::startBuilder()
build user. */
Path chrootStoreDir = chrootRootDir + settings.nixStore;
createDirs(chrootStoreDir);
- chmod_(chrootStoreDir, 0735);
+ chmod_(chrootStoreDir, 01775);
if (chown(chrootStoreDir.c_str(), 0, buildUser.getGID()) == -1)
throw SysError(format("cannot change ownership of ‘%1%’") % chrootStoreDir);
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 3ec467649..91149b30f 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -256,7 +256,7 @@ LocalStore::LocalStore(bool reserveSpace)
if (chmod(perUserDir.c_str(), 01777) == -1)
throw SysError(format("could not set permissions on ‘%1%’ to 1777") % perUserDir);
- mode_t perm = 01735;
+ mode_t perm = 01775;
struct group * gr = getgrnam(settings.buildUsersGroup.c_str());
if (!gr)