commit a68e6f981abc9819ff71b7a4aea60734373ee110
author Changhoon Yoon <chyoon87@kaist.ac.kr> Mon May 02 15:36:43 2016 +0900
committer Gerrit Code Review <gerrit@onlab.us> Wed May 04 21:40:05 2016 +0000
tree b3a98e56aa12bdc8a140a9ecff891a777f62c991
parent 170fe4e3a83b83d261c5429b943aa8aca824f1b8

ONOS-4439 bug fixes for security mode init scripts

Change-Id: I7ba5d3f092a84b5b43434677aff0219aee60adcf

tools/dev/bin/onos-setup-karaf

diff --git a/tools/dev/bin/onos-setup-karaf b/tools/dev/bin/onos-setup-karaf
index 2e470b4..84e9c94 100755
--- a/tools/dev/bin/onos-setup-karaf
+++ b/tools/dev/bin/onos-setup-karaf
@@ -105,7 +105,7 @@
 
     mkdir -p $KARAF_ROOT/system/org/apache/felix/org.apache.felix.configadmin/1.6.0
     cp $FELIX_CFG_ADMIN $KARAF_ROOT/system/org/apache/felix/org.apache.felix.configadmin/1.6.0
-    perl -pi.old -e "s|org.apache.felix.configadmin/1.8.0|org.apache.felix.configadmin/1.6.0|g" \
+    perl -pi.old -e "s|^(.*org.apache.felix.configadmin.*)|mvn\\\\:org.apache.felix/org.apache.felix.configadmin/1.6.0 = 10|" \
         $KARAF_ROOT/etc/startup.properties
 
     # SM-ONOS step 2: stage ONOS Felix framework security (will get downloaded on demand); end