lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Revert /nix/store permission back to 01775

Browse source 
This broke NixOS VM tests.

Mostly reverts 27b7b94923,
5ce50cd99e,
afa433e58c.
This commit is contained in:
Eelco Dolstra 2015-04-07 13:21:26 +02:00
parent afa433e58c
commit 1711679ea5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -1895,7 +1895,7 @@ void DerivationGoal::startBuilder()
build user. */ build user. */
Path chrootStoreDir = chrootRootDir + settings.nixStore; Path chrootStoreDir = chrootRootDir + settings.nixStore;
createDirs(chrootStoreDir); createDirs(chrootStoreDir);
chmod_(chrootStoreDir, 0735); chmod_(chrootStoreDir, 01775);
if (chown(chrootStoreDir.c_str(), 0, buildUser.getGID()) == -1) if (chown(chrootStoreDir.c_str(), 0, buildUser.getGID()) == -1)
throw SysError(format("cannot change ownership of ‘%1%’") % chrootStoreDir); throw SysError(format("cannot change ownership of ‘%1%’") % chrootStoreDir);

2
src/libstore/local-store.cc
View file

@ -256,7 +256,7 @@ LocalStore::LocalStore(bool reserveSpace)
if (chmod(perUserDir.c_str(), 01777) == -1) if (chmod(perUserDir.c_str(), 01777) == -1)
throw SysError(format("could not set permissions on ‘%1%’ to 1777") % perUserDir); 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()); struct group * gr = getgrnam(settings.buildUsersGroup.c_str());
if (!gr) if (!gr)