commit f51950db6ea5b166972ca26befba812f4dd7a0da
author Jonathan Hart <jono@onlab.us> Fri Jan 15 09:57:10 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Feb 26 05:37:13 2016 +0000
tree 6901d62893889eec888d05a4495714cdf47d747f
parent c343f7a94043941ddc994ca65952597a598f1de9

Proposal for replacing Upstart with init.d script.

Change-Id: I22ad1faac713bb50f0b7ad3dde132363a6588723

tools/test/bin/onos-install

diff --git a/tools/test/bin/onos-install b/tools/test/bin/onos-install
index 139944e..ff4fb44 100755
--- a/tools/test/bin/onos-install
+++ b/tools/test/bin/onos-install
@@ -61,6 +61,7 @@
 
     # Make a link to the log file directory and make a home for auxiliaries
     ln -s $ONOS_INSTALL_DIR/$KARAF_DIST/data/log /opt/onos/log
+    ln -s $ONOS_INSTALL_DIR/$KARAF_DIST /opt/onos/karaf
     mkdir $ONOS_INSTALL_DIR/var
     mkdir $ONOS_INSTALL_DIR/config
 
@@ -70,6 +71,7 @@
 
     # Install the upstart configuration file and setup options for debugging
     [ -z "$nostart" ] && sudo cp $ONOS_INSTALL_DIR/init/onos.conf /etc/init/onos.conf
+    [ -z "$nostart" ] && sudo cp $ONOS_INSTALL_DIR/init/onos.initd /etc/init.d/onos
     echo 'export ONOS_OPTS=debug' > $ONOS_INSTALL_DIR/options
 
     # Setup correct user to run onos-service

tools/test/bin/onos-service

diff --git a/tools/test/bin/onos-service b/tools/test/bin/onos-service
index 35764e6..64caa2c 100755
--- a/tools/test/bin/onos-service
+++ b/tools/test/bin/onos-service
@@ -43,7 +43,7 @@
 
         # Execute the remote commands
         for node in $nodes; do
-            ssh $ONOS_USER@${node} "sudo ${2:-status} onos"
+            ssh $ONOS_USER@${node} "sudo /etc/init.d/onos ${2:-status}"
         done
     ;;
     *)