commit 8881c83afe6ced539e7fef7ae8ee4b2d7af4e9f5
author Masayoshi Kobayashi <masayoshi@onlab.us> Fri Jun 21 15:46:47 2013 -0700
committer Masayoshi Kobayashi <masayoshi@onlab.us> Fri Jun 21 15:46:47 2013 -0700
tree 4832f797895d4fb3c1dd5da9e701736b77a77694
parent 972b846d992c206a63b3db47765c385e4518eb57
parent ef0cb00d7d6f2bf89ea1efc36d7088f2c114c432

Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS

cluster-mgmt/bin/bootup.sh

diff --git a/cluster-mgmt/bin/bootup.sh b/cluster-mgmt/bin/bootup.sh
index e58e802..ca86f7e 100755
--- a/cluster-mgmt/bin/bootup.sh
+++ b/cluster-mgmt/bin/bootup.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-. $HOME/bin/func.sh
+. `dirname $0`/func.sh
 
 onos stop
 cassandra cleandb

cluster-mgmt/bin/cassandra

diff --git a/cluster-mgmt/bin/cassandra b/cluster-mgmt/bin/cassandra
index 262c936..b2033ad 100755
--- a/cluster-mgmt/bin/cassandra
+++ b/cluster-mgmt/bin/cassandra
@@ -1,5 +1,5 @@
 #! /bin/bash
-. ${HOME}/bin/func.sh
+. `dirname $0`/func.sh
 
 #$0 $1 $2
 `basename $0` $1 $2

cluster-mgmt/bin/cmd

diff --git a/cluster-mgmt/bin/cmd b/cluster-mgmt/bin/cmd
index 262c936..b2033ad 100755
--- a/cluster-mgmt/bin/cmd
+++ b/cluster-mgmt/bin/cmd
@@ -1,5 +1,5 @@
 #! /bin/bash
-. ${HOME}/bin/func.sh
+. `dirname $0`/func.sh
 
 #$0 $1 $2
 `basename $0` $1 $2

cluster-mgmt/bin/config.sh

diff --git a/cluster-mgmt/bin/config.sh b/cluster-mgmt/bin/config.sh
index 5baf2e0..19bfbf2 100755
--- a/cluster-mgmt/bin/config.sh
+++ b/cluster-mgmt/bin/config.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-. ${HOME}/bin/func.sh
+. `dirname $0`/func.sh
 
 basename=$ONOS_CLUSTER_BASENAME
 nr_nodes=$ONOS_CLUSTER_NR_NODES

cluster-mgmt/bin/func.sh

diff --git a/cluster-mgmt/bin/func.sh b/cluster-mgmt/bin/func.sh
index e3a5b68..fe65ab6 100755
--- a/cluster-mgmt/bin/func.sh
+++ b/cluster-mgmt/bin/func.sh
@@ -1,6 +1,7 @@
 CASSANDRA_DIR='${HOME}/apache-cassandra-1.1.4'
 ZK_DIR='${HOME}/zookeeper-3.4.5'
 ONOS_DIR='${HOME}/ONOS'
+
 ZK_LIB='/var/lib/zookeeper'
 CASSANDRA_LIB='/var/lib/cassandra'
 

cluster-mgmt/bin/onos

diff --git a/cluster-mgmt/bin/onos b/cluster-mgmt/bin/onos
index 262c936..b2033ad 100755
--- a/cluster-mgmt/bin/onos
+++ b/cluster-mgmt/bin/onos
@@ -1,5 +1,5 @@
 #! /bin/bash
-. ${HOME}/bin/func.sh
+. `dirname $0`/func.sh
 
 #$0 $1 $2
 `basename $0` $1 $2

start-zk.sh

diff --git a/start-zk.sh b/start-zk.sh
index ddb2cb9..4e1134e 100755
--- a/start-zk.sh
+++ b/start-zk.sh
@@ -8,7 +8,8 @@
 function start {
   # Run Zookeeper with our configuration
   echo "Starting Zookeeper"
-  cp $ZK_CONF $ZKDIR/conf
+  cp $ZK_CONF $ZK_DIR/conf
+  echo "cp $ZK_CONF $ZK_DIR/conf"
   $ZK_DIR/bin/zkServer.sh start
 }