[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
25/27: Revert /nix/store permission back to 01775
From: |
Ludovic Courtès |
Subject: |
25/27: Revert /nix/store permission back to 01775 |
Date: |
Wed, 03 Jun 2015 22:00:46 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit 64a998ebcb6ebf8c11efa0a0332cce3d8f1c538e
Author: Eelco Dolstra <address@hidden>
Date: Tue Apr 7 13:21:26 2015 +0200
Revert /nix/store permission back to 01775
This broke NixOS VM tests.
Mostly reverts 27b7b94923d2f207781b438bb7a57669bddf7d2b,
5ce50cd99e740d0d0f18c30327ae687be9356553,
afa433e58c3fe6029660a43fdc2073c9d15b4210.
---
nix/libstore/build.cc | 2 +-
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 f3a4a45..85a818b 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 3185609..9d8ae71 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)
- 13/27: libutil: Limit readLink() error to only overflows., (continued)
- 13/27: libutil: Limit readLink() error to only overflows., Ludovic Courtès, 2015/06/03
- 11/27: Pedantry, Ludovic Courtès, 2015/06/03
- 14/27: Set /nix/store permission to 1737, Ludovic Courtès, 2015/06/03
- 16/27: Doh^2, Ludovic Courtès, 2015/06/03
- 17/27: Simplify printHash32, Ludovic Courtès, 2015/06/03
- 18/27: Simplify parseHash32, Ludovic Courtès, 2015/06/03
- 19/27: Use pivot_root in addition to chroot when possible, Ludovic Courtès, 2015/06/03
- 15/27: Doh, Ludovic Courtès, 2015/06/03
- 22/27: Tighten permissions on chroot directories, Ludovic Courtès, 2015/06/03
- 20/27: Use chroots for all derivations, Ludovic Courtès, 2015/06/03
- 25/27: Revert /nix/store permission back to 01775,
Ludovic Courtès <=
- 21/27: Fix typos: s/the the/the/, Ludovic Courtès, 2015/06/03
- 24/27: Chroot builds: Provide world-readable /nix/store, Ludovic Courtès, 2015/06/03
- 23/27: addToStore(): Take explicit name argument, Ludovic Courtès, 2015/06/03
- 27/27: Don't let unprivileged users repair paths, Ludovic Courtès, 2015/06/03
- 26/27: Add a ‘verifyStore’ RPC, Ludovic Courtès, 2015/06/03