@@ -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

@@ -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