From 10db445b3213478b7adaad368cb702dc3b05aac6 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 3 Oct 2011 11:16:32 -0500
Subject: [PATCH] Move ramdisk images to CHROOTCACHEDIR

---
 build_nfs.sh         | 2 +-
 build_pxe_ramdisk.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 @@ wget -c http://images.ansolabs.com/tty.tgz -O $CHROOTCACHE/natty-stack$DEST/file
 
 # 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
 
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 @@ git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH
 
 # 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/