diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-04-07 13:21:26 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-06-03 22:04:09 +0200 |
| commit | 64a998ebcb6ebf8c11efa0a0332cce3d8f1c538e (patch) | |
| tree | 7a9c4a147677aca7395ed30bad2eb814bc18c559 | |
| parent | 44f1b1851ccf836411ca09f5ebc50fc08d92e7e8 (diff) | |
| download | guix-64a998ebcb6ebf8c11efa0a0332cce3d8f1c538e.tar.gz | |
Revert /nix/store permission back to 01775
This broke NixOS VM tests. Mostly reverts 27b7b94923d2f207781b438bb7a57669bddf7d2b, 5ce50cd99e740d0d0f18c30327ae687be9356553, afa433e58c3fe6029660a43fdc2073c9d15b4210.
| -rw-r--r-- | nix/libstore/build.cc | 2 | ||||
| -rw-r--r-- | nix/libstore/local-store.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index f3a4a459eb..85a818ba94 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -1826,7 +1826,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/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index 31856099cd..9d8ae718f6 100644 --- a/nix/libstore/local-store.cc +++ b/nix/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) |