From 1639ed66015874a73bc271dbac02cd1c99158d0f Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Sun, 11 Sep 2011 15:42:17 -0700
Subject: [PATCH] don't name proto filesystem nfs

---
 build.sh | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/build.sh b/build.sh
index 7c98f6f..5fcfe17 100755
--- a/build.sh
+++ b/build.sh
@@ -3,30 +3,28 @@
 # TODO: make dest not hardcoded
 
 NAME=$1
-DEST="/boxes/$NAME/nfs"
-
-mkdir -p /boxes/$NAME
+DEST="/nfs/$NAME"
 
 # remove old nfs filesystem if one exists
 rm -rf $DEST
 
 # build a proto image - natty + packages that will install (optimization)
 if [ ! -d nfs ]; then
-    debootstrap natty nfs
-    cp sources.list nfs/etc/apt/sources.list
-    chroot nfs apt-get update
-    chroot nfs apt-get install -y `cat apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt)"`
-    chroot nfs pip install `cat pips/* | cut -d\# -f1`
-    git clone https://github.com/cloudbuilders/nova.git nfs/opt/nova
-    git clone https://github.com/cloudbuilders/openstackx.git nfs/opt/openstackx
-    git clone https://github.com/cloudbuilders/noVNC.git nfs/opt/noVNC
-    git clone https://github.com/cloudbuilders/openstack-dashboard.git nfs/opt/dash
-    git clone https://github.com/cloudbuilders/python-novaclient.git nfs/opt/python-novaclient
-    git clone https://github.com/cloudbuilders/keystone.git nfs/opt/keystone
-    git clone https://github.com/cloudbuilders/glance.git nfs/opt/glance
+    debootstrap natty proto
+    cp sources.list proto/etc/apt/sources.list
+    chroot proto apt-get update
+    chroot proto apt-get install -y `cat apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt)"`
+    chroot proto pip install `cat pips/* | cut -d\# -f1`
+    git clone https://github.com/cloudbuilders/nova.git proto/opt/nova
+    git clone https://github.com/cloudbuilders/openstackx.git proto/opt/openstackx
+    git clone https://github.com/cloudbuilders/noVNC.git proto/opt/noVNC
+    git clone https://github.com/cloudbuilders/openstack-dashboard.git proto/opt/dash
+    git clone https://github.com/cloudbuilders/python-novaclient.git proto/opt/python-novaclient
+    git clone https://github.com/cloudbuilders/keystone.git proto/opt/keystone
+    git clone https://github.com/cloudbuilders/glance.git proto/opt/glance
 fi
 
-cp -pr nfs $DEST
+cp -pr proto $DEST
 
 # set hostname
 echo $NAME > $DEST/etc/hostname