|
...
|
...
|
@@ -169,8 +169,8 @@ fi
|
|
169
|
169
|
echo "export PS1='${debian_chroot:+($debian_chroot)}\\u@\\H:\\w\\$ '" >> $ROOTFS/$DEST/.bashrc
|
|
170
|
170
|
echo "export PS1='${debian_chroot:+($debian_chroot)}\\u@\\H:\\w\\$ '" >> $ROOTFS/etc/profile
|
|
171
|
171
|
|
|
172
|
|
-# Give stack ownership over /$DEST so it may do the work needed
|
|
173
|
|
-chroot $ROOTFS chown -R stack /$DEST
|
|
|
172
|
+# Give stack ownership over $DEST so it may do the work needed
|
|
|
173
|
+chroot $ROOTFS chown -R stack $DEST
|
|
174
|
174
|
|
|
175
|
175
|
# Configure instance network
|
|
176
|
176
|
INTERFACES=$ROOTFS/etc/network/interfaces
|
|
...
|
...
|
@@ -199,10 +199,10 @@ killall screen
|
|
199
|
199
|
# Install and run stack.sh
|
|
200
|
200
|
sudo apt-get update
|
|
201
|
201
|
sudo apt-get -y --force-yes install git-core vim-nox sudo
|
|
202
|
|
-if [ ! -d "/$DEST/devstack" ]; then
|
|
203
|
|
- git clone git://github.com/cloudbuilders/devstack.git /$DEST/devstack
|
|
|
202
|
+if [ ! -d "$DEST/devstack" ]; then
|
|
|
203
|
+ git clone git://github.com/cloudbuilders/devstack.git $DEST/devstack
|
|
204
|
204
|
fi
|
|
205
|
|
-cd /$DEST/devstack && $STACKSH_PARAMS ./stack.sh > /$DEST/run.sh.log
|
|
|
205
|
+cd $DEST/devstack && $STACKSH_PARAMS ./stack.sh > /$DEST/run.sh.log
|
|
206
|
206
|
EOF
|
|
207
|
207
|
|
|
208
|
208
|
# Make the run.sh executable
|
|
...
|
...
|
@@ -212,7 +212,7 @@ chmod 755 $RUN_SH
|
|
212
|
212
|
RC_LOCAL=$ROOTFS/etc/rc.local
|
|
213
|
213
|
cat > $RC_LOCAL <<EOF
|
|
214
|
214
|
#!/bin/sh -e
|
|
215
|
|
-su -c "/$DEST/run.sh" stack
|
|
|
215
|
+su -c "$DEST/run.sh" stack
|
|
216
|
216
|
EOF
|
|
217
|
217
|
|
|
218
|
218
|
# Configure cgroup directory
|