From 1711679ea5fd6a37db5a7a1b40eba1f58ad6c999 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Apr 2015 13:21:26 +0200 Subject: Revert /nix/store permission back to 01775 This broke NixOS VM tests. Mostly reverts 27b7b94923d2f207781b438bb7a57669bddf7d2b, 5ce50cd99e740d0d0f18c30327ae687be9356553, afa433e58c3fe6029660a43fdc2073c9d15b4210. --- src/libstore/build.cc | 2 +- src/libstore/local-store.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstore') 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) -- cgit v1.2.3