qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

LocalStore initialization: Don't die if build-users-group doesn't exist

Browse source 
See NixOS/nixpkgs@9245516
This commit is contained in:
Shea Levy 2014-12-29 07:18:48 -05:00 committed by Eelco Dolstra
parent bd0f362d2f
commit 3d97b8d1e7
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -258,18 +258,19 @@ LocalStore::LocalStore(bool reserveSpace)
struct group * gr = getgrnam(settings.buildUsersGroup.c_str()); struct group * gr = getgrnam(settings.buildUsersGroup.c_str());
if (!gr) if (!gr)
throw Error(format("the group ‘%1%’ specified in ‘build-users-group’ does not exist") printMsg(lvlError, format("warning: the group ‘%1%’ specified in ‘build-users-group’ does not exist")
% settings.buildUsersGroup); % settings.buildUsersGroup);
else {
struct stat st;
if (stat(settings.nixStore.c_str(), &st))
throw SysError(format("getting attributes of path ‘%1%’") % settings.nixStore);
struct stat st; if (st.st_uid != 0 || st.st_gid != gr->gr_gid || (st.st_mode & ~S_IFMT) != 01775) {
if (stat(settings.nixStore.c_str(), &st)) if (chown(settings.nixStore.c_str(), 0, gr->gr_gid) == -1)
throw SysError(format("getting attributes of path ‘%1%’") % settings.nixStore); throw SysError(format("changing ownership of path ‘%1%’") % settings.nixStore);
if (chmod(settings.nixStore.c_str(), 01775) == -1)
if (st.st_uid != 0 || st.st_gid != gr->gr_gid || (st.st_mode & ~S_IFMT) != 01775) { throw SysError(format("changing permissions on path ‘%1%’") % settings.nixStore);
if (chown(settings.nixStore.c_str(), 0, gr->gr_gid) == -1) }
throw SysError(format("changing ownership of path ‘%1%’") % settings.nixStore);
if (chmod(settings.nixStore.c_str(), 01775) == -1)
throw SysError(format("changing permissions on path ‘%1%’") % settings.nixStore);
} }
} }