Two small changes.

* Copy template datastore to instance "datastore" directory, instead of
  "template_datastore" ... avoid mass confusion.

* Change xxx:// mappping from template datastore to the instance datastore.

tbsetup/Template.pm.in

@@ -2901,7 +2901,7 @@ sub InitializeEnvVariables($;$)
 	}
     }
     $experiment->AddEnvVariable("DATASTORE",
-				"$instance_path/template_datastore", 1)
+				"$instance_path/datastore", 1)
 	== 0 or return -1;
 				    
     $experiment->AddEnvVariable("ARCHIVE",

tbsetup/ns2ir/parse-ns.in

@@ -644,7 +644,7 @@ sub GenDefsFile($)
 	    Template::Instance->LookupByID($experiment->instance_idx());
 	
 	if (defined($instance)) {
-	    my $datastore = $instance->path() . "/template_datastore";
+	    my $datastore = $instance->path() . "/datastore";
 	    my %parameters;
 
 	    print TCL "set ::DATASTORE \"$datastore\"\n";

tbsetup/tarfiles_setup.in

@@ -192,7 +192,7 @@ while (my ($vname, $rpms, $tarfiles) = $result->fetchrow()) {
 	    if (!defined($instance)) {
 		tbdie("Invalid RPM URL for non-template experiment: $rpm");
 	    }
-	    my $localfile = $instance->template()->path() . "/datastore/" . $1;
+	    my $localfile = $instance->path() . "/datastore/" . $1;
 
 	    tbdie("$rpm cannot be found; $localfile does not exist")
 		if (! -e $localfile);
@@ -245,7 +245,7 @@ while (my ($vname, $rpms, $tarfiles) = $result->fetchrow()) {
 		tbdie("Invalid tarball URL for non-template experiment: ".
 		      "$tarfile");
 	    }
-	    my $localfile = $instance->template()->path() . "/datastore/" . $1;
+	    my $localfile = $instance->path() . "/datastore/" . $1;
 
 	    tbdie("$tarfile cannot be found; $localfile does not exist")
 		if (! -e $localfile);

tbsetup/template_instantiate.in

@@ -538,7 +538,7 @@ if (defined($replay_instance)) {
 
 print "Checking out a copy of the template datastore ($datastore_tag)\n";
 $instance->CopyDataStore($datastore_tag,
-			 "$instance_path/template_datastore") == 0
+			 "$instance_path/datastore") == 0
     or fatal(-1, "Could not copy datastore to instance");
 
 # Ditto for dynamic events. 

tbsetup/template_swapin.in

@@ -538,7 +538,7 @@ if (defined($replay_instance)) {
 
 print "Checking out a copy of the template datastore ($datastore_tag)\n";
 $instance->CopyDataStore($datastore_tag,
-			 "$instance_path/template_datastore") == 0
+			 "$instance_path/datastore") == 0
     or fatal(-1, "Could not copy datastore to instance");
 
 # Ditto for dynamic events.