commit cf145b77e4dbe675108c2c7b788e7505d5818fed
author Anthony Young <sleepsonthefloor@gmail.com> Thu Oct 13 15:07:36 2011 -0700
committer Anthony Young <sleepsonthefloor@gmail.com> Thu Oct 13 15:07:36 2011 -0700
tree 1a236d786f859bc1f75177a869a7d6517ee97318
parent f8dfba1c7324e39fada3b694ab3d1451e83de238

merge trunk, and also make sure localrc exists before running  build_lxc.sh

build_lxc.sh

diff --git a/build_lxc.sh b/build_lxc.sh
index 643da7e..8ca3c41 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -11,6 +11,13 @@
     echo "WARNING: this script has only been tested on natty"
 fi
 
+# Abort if localrc is not set
+if [ ! -e ./localrc ]; then
+    echo "You must have a localrc with ALL necessary passwords defined before proceeding."
+    echo "See stack.sh for required passwords."
+    exit 1
+fi
+
 # Source params
 source ./stackrc
 
@@ -248,4 +255,4 @@
   sleep 1
 done
 
-tail -F $ROOTFS/$DEST/run.sh.log
+tail -F $ROOTFS/$DEST/devstack/stack.sh.*.log

stack.sh

diff --git a/stack.sh b/stack.sh
index 97c39f8..dc151a6 100755
--- a/stack.sh
+++ b/stack.sh
@@ -366,7 +366,7 @@
         cat <<EOF >$HOME/.my.cnf
 [client]
 user=$MYSQL_USER
-password=$MYSQL_PASS    
+password=$MYSQL_PASSWORD
 host=$MYSQL_HOST
 EOF
         chmod 0600 $HOME/.my.cnf