commit 4d28218954ce9e7e4425bfd6f51da3b5d3b9ba2a
author Jesse Andrews <anotherjesse@gmail.com> Fri Sep 16 11:27:43 2011 -0700
committer Jesse Andrews <anotherjesse@gmail.com> Fri Sep 16 11:27:43 2011 -0700
tree 16edb4a33bcd8bb44bf92b94e21c3e1240215579
parent 57bca7ea85b287cf1764c9398096786167ae5c12

move apts/pips to files directory

build_nfs.sh

diff --git a/build_nfs.sh b/build_nfs.sh
index 6509011..180a6e5 100755
--- a/build_nfs.sh
+++ b/build_nfs.sh
@@ -13,8 +13,8 @@
     debootstrap natty proto
     cp files/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-bin|mysql-server)"`
-    chroot proto pip install `cat pips/*`
+    chroot proto apt-get install -y `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`
+    chroot proto pip install `cat files/pips/*`
     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
@@ -34,14 +34,13 @@
 # copy kernel modules
 cp -pr /lib/modules/`uname -r` $DEST/lib/modules
 
-# inject stack.sh files
-cp -r files $DEST/opt/files
 
 # copy openstack installer and requirement lists to a new directory.
 mkdir -p $DEST/opt
+
+# inject stack.sh and dependant files
+cp -r files $DEST/opt/files
 cp stack.sh $DEST/opt/stack.sh
-cp -r pips $DEST/opt
-cp -r apts $DEST/opt
 
 # injecting root's public ssh key if it exists
 if [ -f /root/.ssh/id_rsa.pub ]; then