From ab3d050562e047247ce2a29abb50d6d8defe1edb Mon Sep 17 00:00:00 2001
From: Ivan Davidov <davidov.i@gmail.com>
Date: Mon, 4 Dec 2017 15:33:40 +0200
Subject: [PATCH] Use local configuration (Apache Felix).

---
 src/.config                                     | 6 ------
 src/minimal_overlay/bundles/felix/.config       | 5 +++++
 src/minimal_overlay/bundles/felix/01_get.sh     | 8 +++-----
 src/minimal_overlay/bundles/felix/02_install.sh | 2 ++
 src/minimal_overlay/bundles/felix/90_felix.sh   | 8 ++++++++
 src/{rebuild.sh => repackage.sh}                | 0
 6 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 src/minimal_overlay/bundles/felix/.config
 create mode 100755 src/minimal_overlay/bundles/felix/90_felix.sh
 rename src/{rebuild.sh => repackage.sh} (100%)

diff --git a/src/.config b/src/.config
index 5029572bf..2f40aadd6 100644
--- a/src/.config
+++ b/src/.config
@@ -41,12 +41,6 @@ SYSLINUX_SOURCE_URL=http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.0
 #                                                                   #
 #####################################################################
 
-# You can find the latest Apache Felix source bundles here:
-#
-#   http://felix.apache.org
-#
-FELIX_SOURCE_URL=http://archive.apache.org/dist/felix/org.apache.felix.main.distribution-5.6.10.tar.gz
-
 # You can find the latest fio source bundles here:
 #
 #   https://github.com/axboe/fio/releases
diff --git a/src/minimal_overlay/bundles/felix/.config b/src/minimal_overlay/bundles/felix/.config
new file mode 100644
index 000000000..f5d7bb972
--- /dev/null
+++ b/src/minimal_overlay/bundles/felix/.config
@@ -0,0 +1,5 @@
+# You can find the latest Apache Felix source bundles here:
+#
+#   http://felix.apache.org
+#
+FELIX_SOURCE_URL=http://archive.apache.org/dist/felix/org.apache.felix.main.distribution-5.6.10.tar.gz
diff --git a/src/minimal_overlay/bundles/felix/01_get.sh b/src/minimal_overlay/bundles/felix/01_get.sh
index 835897201..4a646abae 100755
--- a/src/minimal_overlay/bundles/felix/01_get.sh
+++ b/src/minimal_overlay/bundles/felix/01_get.sh
@@ -4,15 +4,13 @@ set -e
 
 . ../../common.sh
 
-# Grab everything after the '=' character.
-DOWNLOAD_URL=$(grep -i FELIX_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=')
+# Read the common configuration properties.
+DOWNLOAD_URL=`read_property FELIX_SOURCE_URL`
+USE_LOCAL_SOURCE=`read_property USE_LOCAL_SOURCE`
 
 # Grab everything after the last '/' character.
 ARCHIVE_FILE=${DOWNLOAD_URL##*/}
 
-# Read the 'USE_LOCAL_SOURCE' property from '.config'
-USE_LOCAL_SOURCE="$(grep -i USE_LOCAL_SOURCE $MAIN_SRC_DIR/.config | cut -f2 -d'=')"
-
 if [ "$USE_LOCAL_SOURCE" = "true" -a ! -f $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE  ] ; then
   echo "Source bundle $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE is missing and will be downloaded."
   USE_LOCAL_SOURCE="false"
diff --git a/src/minimal_overlay/bundles/felix/02_install.sh b/src/minimal_overlay/bundles/felix/02_install.sh
index c605834c8..ba580b508 100755
--- a/src/minimal_overlay/bundles/felix/02_install.sh
+++ b/src/minimal_overlay/bundles/felix/02_install.sh
@@ -8,6 +8,7 @@ echo "Removing old 'Apache Felix' artifacts. This may take a while."
 rm -rf $DEST_DIR
 mkdir -p $DEST_DIR/opt/felix
 mkdir -p $DEST_DIR/bin
+mkdir -p $DEST_DIR/etc/autorun
 
 cd $WORK_DIR/overlay/felix
 cd $(ls -d felix-*)
@@ -23,6 +24,7 @@ CEOF
 chmod +rx bin/felix-start.sh
 
 cp -r * $DEST_DIR/opt/felix
+cp $SRC_DIR/90_felix.sh $DEST_DIR/etc/autorun
 
 cd $DEST_DIR
 
diff --git a/src/minimal_overlay/bundles/felix/90_felix.sh b/src/minimal_overlay/bundles/felix/90_felix.sh
new file mode 100755
index 000000000..e9a3b7af1
--- /dev/null
+++ b/src/minimal_overlay/bundles/felix/90_felix.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+dropbear
+
+cat << CEOF
+  You can start Apache Felix by executing 'felix-start'. You can stop
+  Apache Felix by executing 'stop 0' from the Gogo shell.
+CEOF
diff --git a/src/rebuild.sh b/src/repackage.sh
similarity index 100%
rename from src/rebuild.sh
rename to src/repackage.sh