From cf145b77e4dbe675108c2c7b788e7505d5818fed Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Thu, 13 Oct 2011 15:07:36 -0700
Subject: [PATCH] merge trunk, and also make sure localrc exists before running
  build_lxc.sh

---
 build_lxc.sh | 9 ++++++++-
 stack.sh     | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build_lxc.sh b/build_lxc.sh
index 643da7e4be..8ca3c41d01 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -11,6 +11,13 @@ if ! grep -q natty /etc/lsb-release; then
     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 @@ while [ ! -e "$ROOTFS/$DEST/run.sh.log" ]; do
   sleep 1
 done
 
-tail -F $ROOTFS/$DEST/run.sh.log
+tail -F $ROOTFS/$DEST/devstack/stack.sh.*.log
diff --git a/stack.sh b/stack.sh
index 97c39f81ea..dc151a63df 100755
--- a/stack.sh
+++ b/stack.sh
@@ -366,7 +366,7 @@ MYSQL_PRESEED
         cat <<EOF >$HOME/.my.cnf
 [client]
 user=$MYSQL_USER
-password=$MYSQL_PASS    
+password=$MYSQL_PASSWORD
 host=$MYSQL_HOST
 EOF
         chmod 0600 $HOME/.my.cnf