merge trunk, and also make sure localrc exists before running build_lxc.sh
This commit is contained in:
parent
f8dfba1c73
commit
cf145b77e4
2 changed files with 9 additions and 2 deletions
|
@ -11,6 +11,13 @@ if ! grep -q natty /etc/lsb-release; then
|
||||||
echo "WARNING: this script has only been tested on natty"
|
echo "WARNING: this script has only been tested on natty"
|
||||||
fi
|
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 params
|
||||||
source ./stackrc
|
source ./stackrc
|
||||||
|
|
||||||
|
@ -248,4 +255,4 @@ while [ ! -e "$ROOTFS/$DEST/run.sh.log" ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
tail -F $ROOTFS/$DEST/run.sh.log
|
tail -F $ROOTFS/$DEST/devstack/stack.sh.*.log
|
||||||
|
|
2
stack.sh
2
stack.sh
|
@ -366,7 +366,7 @@ MYSQL_PRESEED
|
||||||
cat <<EOF >$HOME/.my.cnf
|
cat <<EOF >$HOME/.my.cnf
|
||||||
[client]
|
[client]
|
||||||
user=$MYSQL_USER
|
user=$MYSQL_USER
|
||||||
password=$MYSQL_PASS
|
password=$MYSQL_PASSWORD
|
||||||
host=$MYSQL_HOST
|
host=$MYSQL_HOST
|
||||||
EOF
|
EOF
|
||||||
chmod 0600 $HOME/.my.cnf
|
chmod 0600 $HOME/.my.cnf
|
||||||
|
|
Loading…
Reference in a new issue