Make the store writable before creating /nix/store/.links

edolstra · edolstra · commit d534f137f0b0 · 2012-09-25T16:30:08.000-04:00
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
@@ -212,6 +212,7 @@ LocalStore::LocalStore(bool reserveSpace)
 
     /* Create missing state directories if they don't already exist. */
     createDirs(settings.nixStore);
+    makeStoreWritable();
     createDirs(linksDir = settings.nixStore + "/.links");
     Path profilesDir = settings.nixStateDir + "/profiles";
     createDirs(settings.nixStateDir + "/profiles");
@@ -297,8 +298,6 @@ LocalStore::LocalStore(bool reserveSpace)
     }
 
     else openDB(false);
-
-    makeStoreWritable();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,7 @@ LocalStore::LocalStore(bool reserveSpace)`
`212`	`212`
`213`	`213`	`/* Create missing state directories if they don't already exist. */`
`214`	`214`	`createDirs(settings.nixStore);`
	`215`	`+ makeStoreWritable();`
`215`	`216`	`createDirs(linksDir = settings.nixStore + "/.links");`
`216`	`217`	`Path profilesDir = settings.nixStateDir + "/profiles";`
`217`	`218`	`createDirs(settings.nixStateDir + "/profiles");`
`@@ -297,8 +298,6 @@ LocalStore::LocalStore(bool reserveSpace)`
`297`	`298`	`}`
`298`	`299`
`299`	`300`	`else openDB(false);`
`300`		`-`
`301`		`- makeStoreWritable();`
`302`	`301`	`}`
`303`	`302`
`304`	`303`