Skip to content

Commit

Permalink
local-store: do not remove system.nfs4_acl
Browse files Browse the repository at this point in the history
Fixes NixOS/nixpkgs#29778

Removal of this ACL breaks nix if the store resides on an
NFSv 4.1 mount.
  • Loading branch information
phi-gamma committed Sep 28, 2017
1 parent e8d6ee7 commit 8d3cb66
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstore/local-store.cc
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ static void canonicalisePathMetaData_(const Path & path, uid_t fromUid, InodesSe
for (auto & eaName: tokenizeString<Strings>(std::string(eaBuf.data(), eaSize), std::string("\000", 1))) {
/* Ignore SELinux security labels since these cannot be
removed even by root. */
if (eaName == "security.selinux") continue;
if (eaName == "security.selinux" || eaName == "system.nfs4_acl") continue;
if (lremovexattr(path.c_str(), eaName.c_str()) == -1)
throw SysError("removing extended attribute '%s' from '%s'", eaName, path);
}
Expand Down

0 comments on commit 8d3cb66

Please sign in to comment.