홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Changhoon Yoon
Committed by Gerrit Code Review
a68e6f98 1 parent 170fe4e3

ONOS-4439 bug fixes for security mode init scripts 

Change-Id: I7ba5d3f092a84b5b43434677aff0219aee60adcf
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
...@@ -110,7 +110,7 @@ function enable_security_mode() { ...@@ -110,7 +110,7 @@ function enable_security_mode() {
110 110
111 mkdir -p $ONOS_STAGE/$KARAF_DIST/system/org/apache/felix/org.apache.felix.configadmin/1.6.0 111 mkdir -p $ONOS_STAGE/$KARAF_DIST/system/org/apache/felix/org.apache.felix.configadmin/1.6.0
112 cp $FELIX_CFG_ADMIN $ONOS_STAGE/$KARAF_DIST/system/org/apache/felix/org.apache.felix.configadmin/1.6.0 112 cp $FELIX_CFG_ADMIN $ONOS_STAGE/$KARAF_DIST/system/org/apache/felix/org.apache.felix.configadmin/1.6.0
113 - perl -pi.old -e "s|org.apache.felix.configadmin/1.8.0|org.apache.felix.configadmin/1.6.0|g" \ 113 + perl -pi.old -e "s|^(.*org.apache.felix.configadmin.*)|mvn\\\\:org.apache.felix/org.apache.felix.configadmin/1.6.0 = 10|" \
114 $ONOS_STAGE/$KARAF_DIST/etc/startup.properties 114 $ONOS_STAGE/$KARAF_DIST/etc/startup.properties
115 115
116 # SM-ONOS step 2: stage ONOS Felix framework security (this is already done by karaf assembly); end 116 # SM-ONOS step 2: stage ONOS Felix framework security (this is already done by karaf assembly); end
......
...@@ -105,7 +105,7 @@ if [ "$SECURE" = "true" ]; then ...@@ -105,7 +105,7 @@ if [ "$SECURE" = "true" ]; then
105 105
106 mkdir -p $KARAF_ROOT/system/org/apache/felix/org.apache.felix.configadmin/1.6.0 106 mkdir -p $KARAF_ROOT/system/org/apache/felix/org.apache.felix.configadmin/1.6.0
107 cp $FELIX_CFG_ADMIN $KARAF_ROOT/system/org/apache/felix/org.apache.felix.configadmin/1.6.0 107 cp $FELIX_CFG_ADMIN $KARAF_ROOT/system/org/apache/felix/org.apache.felix.configadmin/1.6.0
108 - perl -pi.old -e "s|org.apache.felix.configadmin/1.8.0|org.apache.felix.configadmin/1.6.0|g" \ 108 + perl -pi.old -e "s|^(.*org.apache.felix.configadmin.*)|mvn\\\\:org.apache.felix/org.apache.felix.configadmin/1.6.0 = 10|" \
109 $KARAF_ROOT/etc/startup.properties 109 $KARAF_ROOT/etc/startup.properties
110 110
111 # SM-ONOS step 2: stage ONOS Felix framework security (will get downloaded on demand); end 111 # SM-ONOS step 2: stage ONOS Felix framework security (will get downloaded on demand); end
......