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

* Create some state directories automatically as a convenience.

Browse source
This commit is contained in:
Eelco Dolstra 2009-09-23 17:05:51 +00:00
parent 48b58617e9
commit 64e89980e8
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -467,6 +467,8 @@ void UserLock::acquire()
if (!pw) if (!pw)
throw Error(format("the user `%1%' in the group `%2%' does not exist") throw Error(format("the user `%1%' in the group `%2%' does not exist")
% *i % buildUsersGroup); % *i % buildUsersGroup);
createDirs(nixStateDir + "/userpool");
fnUserLock = (format("%1%/userpool/%2%") % nixStateDir % pw->pw_uid).str(); fnUserLock = (format("%1%/userpool/%2%") % nixStateDir % pw->pw_uid).str();

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

@ -47,8 +47,21 @@ LocalStore::LocalStore()
if (readOnlyMode) return; if (readOnlyMode) return;
/* Create missing state directories if they don't already exist. */
createDirs(nixStore); createDirs(nixStore);
createDirs(nixDBPath + "/info");
createDirs(nixDBPath + "/referrer");
createDirs(nixDBPath + "/failed");
Path profilesDir = nixStateDir + "/profiles";
createDirs(nixStateDir + "/profiles");
createDirs(nixStateDir + "/temproots");
Path gcRootsDir = nixStateDir + "/gcroots";
if (!pathExists(gcRootsDir)) {
createDirs(gcRootsDir);
if (symlink(profilesDir.c_str(), (gcRootsDir + "/profiles").c_str()) == -1)
throw SysError(format("creating symlink to `%1%'") % profilesDir);
}
checkStoreNotSymlink(); checkStoreNotSymlink();
try { try {
@ -64,11 +77,7 @@ LocalStore::LocalStore()
printMsg(lvlError, "waiting for the big Nix store lock..."); printMsg(lvlError, "waiting for the big Nix store lock...");
lockFile(globalLock, ltRead, true); lockFile(globalLock, ltRead, true);
} }
createDirs(nixDBPath + "/info");
createDirs(nixDBPath + "/referrer");
createDirs(nixDBPath + "/failed");
int curSchema = getSchema(); int curSchema = getSchema();
if (curSchema > nixSchemaVersion) if (curSchema > nixSchemaVersion)
throw Error(format("current Nix store schema is version %1%, but I only support %2%") throw Error(format("current Nix store schema is version %1%, but I only support %2%")