1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00

Merge branch 'master' of git.opennebula.org:one

This commit is contained in:
Daniel Molina 2011-07-12 22:30:45 +02:00
commit 834a783d26

View File

@ -22,7 +22,6 @@ if [ -z "$ONE_LOCATION" ]; then
ONE_CONF=/etc/one/oned.conf
ONE_DB=/var/lib/one/one.db
ONE_LOG=/var/log/one/oned.log
ONE_CONFIG=/var/lib/one/config
ONED=/usr/bin/oned
ONE_SCHEDULER=/usr/bin/mm_sched
@ -34,7 +33,6 @@ else
ONE_CONF=$ONE_LOCATION/etc/oned.conf
ONE_DB=$ONE_LOCATION/var/one.db
ONE_LOG=$ONE_LOCATION/var/oned.log
ONE_CONFIG=$ONE_LOCATION/var/config
ONED=$ONE_LOCATION/bin/oned
ONE_SCHEDULER=$ONE_LOCATION/bin/mm_sched
@ -47,10 +45,11 @@ fi
#------------------------------------------------------------------------------
setup()
{
PORT=$(grep '^PORT=' $ONE_CONFIG | sed 's/PORT=//')
PORT=$(sed -n '/^[ \t]*PORT/s/^.*PORT\s*=\s*\([0-9]\+\)\s*.*$/\1/p' \
$ONE_CONF)
if [ $? -ne 0 ]; then
echo "Can not find PORT in $ONE_CONFIG."
echo "Can not find PORT in $ONE_CONF."
exit 1
fi