commit 2bd1fc85e064e6d101f594b870ff87f7a972ec9a
author Thomas Vachuska <tom@opennetworking.org> Mon Oct 22 13:09:14 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Mon Oct 22 13:44:14 2018 -0700
tree 3592febe1ee9cb6f0e940758a80cc0acc728aaf7
parent bef430b5f859171613c67d4e42a237772a3559ab

Fixing GUI packaging and web-socket code to allow onos-gui feature to load properly.

Change-Id: Idb3ed6ec1b96b3bfae75039de4644983ac4014bd

tools/package/etc/org.apache.karaf.features.cfg

diff --git a/tools/package/etc/org.apache.karaf.features.cfg b/tools/package/etc/org.apache.karaf.features.cfg
index 33cb5cf..ed40d61 100644
--- a/tools/package/etc/org.apache.karaf.features.cfg
+++ b/tools/package/etc/org.apache.karaf.features.cfg
@@ -57,8 +57,8 @@
     onos-core/$ONOS_VERSION, \
     onos-incubator/$ONOS_VERSION, \
     onos-cli/$ONOS_VERSION, \
-    onos-rest/$ONOS_VERSION
-    #onos-gui/$ONOS_VERSION
+    onos-rest/$ONOS_VERSION, \
+    onos-gui/$ONOS_VERSION
 
 
 #

tools/package/onos-run-karaf

diff --git a/tools/package/onos-run-karaf b/tools/package/onos-run-karaf
index e86306b..c22ab95 100755
--- a/tools/package/onos-run-karaf
+++ b/tools/package/onos-run-karaf
@@ -10,7 +10,7 @@
 
 function killServer() {
     echo "Killing ONOS server..."
-    ps -e | grep apache.karaf.main.Main | grep -v grep | cut -d\  -f1 | xargs kill -9 &>/dev/null
+    ps -e | grep apache.karaf.main.Main | grep -v grep | cut -c1-6 | xargs kill -9 &>/dev/null
 }
 
 # Kill any running instances