commit 10db445b3213478b7adaad368cb702dc3b05aac6
author Dean Troyer <dtroyer@gmail.com> Mon Oct 03 11:16:32 2011 -0500
committer Dean Troyer <dtroyer@gmail.com> Mon Oct 03 11:28:05 2011 -0500
tree a80c489dbc421eb98e9f7205340d1e2575019ea1
parent a3379e0eb13ebf3e8c25d40ea3f79a2189f8f75b

Move ramdisk images to CHROOTCACHEDIR

build_nfs.sh

diff --git a/build_nfs.sh b/build_nfs.sh
index f2a7b13..185d0ad 100755
--- a/build_nfs.sh
+++ b/build_nfs.sh
@@ -99,7 +99,7 @@
 
 # Use this version of devstack?
 if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then
-    rm -rf $$CHROOTCACHE/natty-stack/$DEST/devstack
+    rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack
     cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack
 fi
 

build_pxe_ramdisk.sh

diff --git a/build_pxe_ramdisk.sh b/build_pxe_ramdisk.sh
index 63e2ed4..46eeb05 100755
--- a/build_pxe_ramdisk.sh
+++ b/build_pxe_ramdisk.sh
@@ -97,12 +97,12 @@
 
 # Use this version of devstack?
 if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then
-    rm -rf $$CHROOTCACHE/natty-stack/$DEST/devstack
+    rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack
     cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack
 fi
 
 # build a new image
-BASE=build.$$
+BASE=$CHROOTCACHE/build.$$
 IMG=$BASE.img
 MNT=$BASE/