reverting a previous erroneous fix

eucalyptus · Jul 12, 2011 · 5e5fc6a · 5e5fc6a
1 parent 6b0645e
commit 5e5fc6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/node/handlers_default.c b/node/handlers_default.c
@@ -824,6 +824,7 @@ static void * bundling_thread (void *arg)
 
 	int rc=OK;
 	char bundlePath[MAX_PATH];
+    bundlePath[0] = '\0';
         if (clone_bundling_backing(instance, params->filePrefix, bundlePath) != OK){
 		logprintfl(EUCAERROR, "bundling_thread: could not clone the instance image\n");
 	} else {

diff --git a/storage/backing.c b/storage/backing.c
@@ -371,6 +371,9 @@ int clone_bundling_backing (ncInstance *instance, const char* filePrefix, char*
 	logprintfl (EUCAERROR, "[%s] couldn't create the destination blob for bundling (%s)", instance->instanceId, id);
 	goto error;
     }
+
+    if(strlen(dest_blob->blocks_path) > 0)
+        snprintf(blockPath, MAX_PATH, "%s", dest_blob->blocks_path);
 
     // copy blob (will 'dd' eventually)
     if(blockblob_copy(src_blob, 0, dest_blob, 0, src_blob->size_bytes) != OK) {