Browse code

Add CONTAINER_NAME to BASE_IMAGE_COPY value

Dean Troyer authored on 2011/10/22 04:28:03
Showing 1 changed files
... ...
@@ -45,14 +45,14 @@ source ./stackrc
45 45
 DIST_NAME=${DIST_NAME:-natty}
46 46
 IMAGE_FNAME=$DIST_NAME.raw
47 47
 
48
+# Name of our instance, used by libvirt
49
+CONTAINER_NAME=${CONTAINER_NAME:-kvmstack}
50
+
48 51
 # Original version of built image
49 52
 BASE_IMAGE=$KVMSTACK_DIR/images/natty.raw
50 53
 
51 54
 # Copy of base image, which we pre-install with tasty treats
52
-BASE_IMAGE_COPY=$IMAGES_DIR/$DIST_NAME.raw.copy
53
-
54
-# Name of our instance, used by libvirt
55
-CONTAINER_NAME=${CONTAINER_NAME:-kvmstack}
55
+BASE_IMAGE_COPY=$IMAGES_DIR/$DIST_NAME.$CONTAINER_NAME.raw.copy
56 56
 
57 57
 # Mop up after previous runs
58 58
 virsh destroy $CONTAINER_NAME