commit 03412c8cb91c64cb2f3dcfb9316a4a952500e1e0
author Dean Troyer <dtroyer@gmail.com> Mon Oct 03 09:56:41 2011 -0500
committer Dean Troyer <dtroyer@gmail.com> Mon Oct 03 09:56:41 2011 -0500
tree a261768d64f885695d33bb7e307392364deb1d20
parent 11e5e6fc3da3f3de78d1897ce453e74e84d10540

Copy devstack into image

build_pxe_ramdisk.sh

diff --git a/build_pxe_ramdisk.sh b/build_pxe_ramdisk.sh
index d12f23b..9d26886 100755
--- a/build_pxe_ramdisk.sh
+++ b/build_pxe_ramdisk.sh
@@ -12,6 +12,9 @@
 # Source params
 source ./stackrc
 
+# Store cwd
+CWD=`pwd`
+
 DEST=${DEST:-/opt/stack}
 
 # clean install of natty
@@ -89,6 +92,12 @@
 git_clone $NOVACLIENT_REPO $DEST/python-novaclient $NOVACLIENT_BRANCH
 git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH
 
+# Use this version of devstack?
+if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then
+    rm -rf $CACHEDIR/$DEST/devstack
+    cp -pr $CWD $CACHEDIR/$DEST/devstack
+fi
+
 # build a new image
 BASE=build.$$
 IMG=$BASE.img