install_full.sh

@@ -21,6 +21,9 @@ if [ "$1" = "full" ]; then
   nix-env-all-pkgs.sh -i gdb			#optional for debugging
   nix-env-all-pkgs.sh -i gnupatch
   nix-env-all-pkgs.sh -i gnumake
+  nix-env-all-pkgs.sh -i ext3cow-tools
+  nix-env-all-pkgs.sh -i e3cfsprogs
+  
 fi
 
 if [ "$1" = "full" ] || [ "$1" = "auto" ]; then

src/libstore/build.cc

@@ -1829,7 +1829,9 @@ void DerivationGoal::computeClosure()
 		}
 		//If not shared: create the dir and set the rights
 		else{
-			setStatePathRights(statePath, queryCallingUsername(), "nixbld", "700");
+			ensureDirExists(statePath);
+			setChown(statePath, queryCallingUsername(), "nixbld");
+			setChmod(statePath, "700");
 		}
     }	    
     

src/libstore/remote-store.cc

@@ -527,6 +527,7 @@ void RemoteStore::revertToRevision(const Path & componentPath, const Path & deri
 
 void RemoteStore::setSharedState(const Path & fromExisting, const Path & toNew)
 {
+	writeInt(wopSetSharedState, to);
 	writeString(fromExisting, to);
 	writeString(toNew, to);
 	processStderr();

src/libstore/store-api.cc

@@ -143,9 +143,11 @@ void checkStatePath(const Derivation & drv)
     string componentHash = drv.stateOutputs.find("state")->second.componentHash;
     string suffix = drv.env.find("name")->second;
 	string stateIdentifier = drv.stateOutputs.find("state")->second.stateIdentifier;
-    Path calculatedPath = makeStatePath(componentHash, suffix, stateIdentifier);
+    Path calculatedPath = makeStatePath(componentHash, suffix, stateIdentifier);				//TODO INCLUDE USER !!!!!!!!!!!!
 	
-	printMsg(lvlError, format("Checking statePath validity: %1% %2%") % drvPath % calculatedPath);
+	//TODO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! calculatedPath IS NOT CORRECT ANYMORE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	
+	printMsg(lvlError, format("Checking statePath validity: %1% %2%") % drvPath % calculatedPath);		
 		
     if(drvPath != calculatedPath)
     	Error(format("The statepath from the Derivation does not match the recalculated statepath, are u trying to spoof the statepath?"));

src/libstore/store-state.cc

@@ -50,20 +50,23 @@ void createSubStateDirsTxn(const Transaction & txn, const DerivationStateOutputD
 		DerivationStateOutputDir d = i->second;
 
 		string thisdir = d.path;
-		
-		//If it is a file: continue
-		if(thisdir.substr(thisdir.length() -1 , thisdir.length()) != "/")
-			continue;
-		
 		Path fullstatedir = stateDir + "/" + thisdir;
 		
-		setStatePathRights(fullstatedir, queryCallingUsername(), "nixbld");
+		//If it is a file: continue
+		if(thisdir.substr(thisdir.length() -1 , thisdir.length()) != "/"){
+			continue;
+		}		
+		
+		ensureDirExists(fullstatedir);
 		
 		if(d.type == "interval"){
 			intervalPaths.insert(fullstatedir);
 		}		
 	}
 	
+	setChown(statePath, queryCallingUsername(), "nixbld", true);		//Set all dirs in the statePath recursively to their owners
+	printMsg(lvlTalkative, format("Set CHOWN '%1%'") % (statePath + "-" + queryCallingUsername()));
+	
 	//Initialize the counters for the statePaths that have an interval to 0
 	IntVector empty;
 	setStatePathsIntervalTxn(txn, intervalPaths, empty, true);

src/libstore/worker-protocol.hh

@@ -24,7 +24,7 @@ typedef enum {
     wopQueryStateReferrers,					
     wopAddToStore,							
     wopAddTextToStore,
-    wopBuildDerivations,					//TODO HANGS SOMETIMES !!!!!
+    wopBuildDerivations,					//TODO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! HANGS SOMETIMES !!!!!
     wopEnsurePath,
     wopAddTempRoot,
     wopAddIndirectRoot,

src/libutil/util.cc

@@ -259,7 +259,7 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed)
 
     struct stat st;
     if (lstat(path.c_str(), &st))
-	throw SysError(format("getting attributes of path `%1%'") % path);
+		throw SysError(format("getting attributes of path `%1%'") % path);
 
     bytesFreed += st.st_size;
 
@@ -269,7 +269,7 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed)
 	/* Make the directory writable. */
 	if (!(st.st_mode & S_IWUSR)) {
 	    if (chmod(path.c_str(), st.st_mode | S_IWUSR) == -1)
-		throw SysError(format("making `%1%' writable") % path);
+			throw SysError(format("making `%1%' writable") % path);
 	}
 
 	for (Strings::iterator i = names.begin(); i != names.end(); ++i)
@@ -1241,20 +1241,22 @@ void ensureDirExists(const Path & path)
 	runProgram_AndPrintOutput("mkdir", true, p_args, "mkdir");		//TODO ensurePath
 }
 
-void setStatePathRights(const Path & statePath, const string & user, const string & group, const string & chmod)
+void setChown(const Path & pathOrFile, const string & user, const string & group, bool recursive)
 {
-	ensureDirExists(statePath);
 	Strings p_args;
+	if(recursive)
+		p_args.push_back("-R");
 	p_args.push_back(user + "." + group);
-	p_args.push_back(statePath);
+	p_args.push_back(pathOrFile);
 	runProgram_AndPrintOutput("chown", true, p_args, "chown");
-	
-	if(chmod != "")	{
-		p_args.clear();
-		p_args.push_back(chmod);
-		p_args.push_back(statePath);
-		runProgram_AndPrintOutput("chmod", true, p_args, "chmod");
-	}
+} 
+
+void setChmod(const Path & pathOrFile, const string & chmod)
+{
+	Strings p_args;
+	p_args.push_back(chmod);
+	p_args.push_back(pathOrFile);
+	runProgram_AndPrintOutput("chmod", true, p_args, "chmod");
 }
 
 string padd(const string & s, char c , unsigned int size, bool front)

src/libutil/util.hh

@@ -322,7 +322,8 @@ void pathSets_difference(const PathSet & oldpaths, const PathSet & newpaths, Pat
 void ensureDirExists(const Path & path);
 
 /* TODO */
-void setStatePathRights(const Path & statePath, const string & user, const string & group, const string & chmod = "");
+void setChown(const Path & pathOrFile, const string & user, const string & group, bool recursive = false);
+void setChmod(const Path & pathOrFile, const string & chmod);
 
 string padd(const string & s, char c , unsigned int size, bool front = false);
 

src/nix-env/nix-env.cc

@@ -572,7 +572,7 @@ static void installDerivations(Globals & globals,
     				oldStatePath = oldDrv.stateOutputs.find("state")->second.statepath;
     				
         			//SharePaths
-        			printMsg(lvlError, format("Sharing state from old to new component '%1%' --> '%2%'") % newStatePath % oldStatePath);
+        			printMsg(lvlError, format("Sharing state from old <-- new component '%1%' <-- '%2%'") % oldStatePath % newStatePath);
 					toBeShared[oldStatePath] = newStatePath;
 	        	}
         		else{	//If not equal, then we do not replace, so we push back (just like the else branch)  			
@@ -601,7 +601,9 @@ static void installDerivations(Globals & globals,
     //After all components have been built succesfully, share their state paths with the old ones    
     for (StringPairs::iterator i = toBeShared.begin(); i != toBeShared.end(); ++i){
 
-		deletePathWrapped(i->second);		//Remove contents of current new state path
+		printMsg(lvlError, format("Sharing state from old <-- new component '%1%' <-- '%2%'") % i->first % i->second);
+		
+		deletePath(i->second);				//Remove contents of current new state path
 		sharePath(i->first, i->second);		//Share new statepath to the old statepath
 		
 		//Set in database