Merge "enable fast load and timestamps"

diff --git a/odlsli/src/main/scripts/installCcsdkFeatures.sh b/odlsli/src/main/scripts/installCcsdkFeatures.sh
index 9aff1d8..e1d7a9f 100644 (file)
--- a/odlsli/src/main/scripts/installCcsdkFeatures.sh
+++ b/odlsli/src/main/scripts/installCcsdkFeatures.sh
@@ -69,7 +69,7 @@ do
   then
     ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
   else
-    echo "No installer found for feature sdnc-${feature}"
+    echo "No installer found for feature ccsdk-${feature}"
   fi
 done
 
@@ -87,11 +87,11 @@ done
 echo "Installing CCSDK sli/northbound"
 for feature in ${CCSDK_NORTHBOUND_FEATURES}
 do
-  if [ -f ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
+  if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ]
   then
-    ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
+    ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
   else
-    echo "No installer found for feature sdnc-${feature}"
+    echo "No installer found for feature ccsdk-${feature}"
   fi
 done
 
@@ -99,10 +99,10 @@ done
 echo "Installing CCSDK sli/plugins"
 for feature in ${CCSDK_PLUGINS_FEATURES}
 do
-  if [ -f ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
+  if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ]
   then
-    ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
+    ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
   else
-    echo "No installer found for feature sdnc-${feature}"
+    echo "No installer found for feature ccsdk-${feature}"
   fi
 done

diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 50e45ce..70341af 100644 (file)
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -60,7 +60,9 @@ then
 
        echo "Restarting OpenDaylight"
        ${ODL_HOME}/bin/stop
+       echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to stop"
+       sleep ${SLEEP_TIME}
        echo "Installed at `date`" > ${CCSDK_HOME}/.installed
 fi
 
-exec ${ODL_HOME}/bin/karaf
+exec ${ODL_HOME}/bin/karaf server