From cefba977145a541da3b1c5d9164805d2d36cc1d5 Mon Sep 17 00:00:00 2001
From: pvizeli <pvizeli@syshack.ch>
Date: Wed, 22 Mar 2017 11:08:42 +0100
Subject: [PATCH] Minor bugfix

---
 .../classes/resin-connectable-service.bbclass    | 16 ++++++++++++++++
 meta-hassio/conf/distro/hassio.conf              |  1 +
 .../update-resin-supervisor                      |  1 +
 .../recipes-core/dropbear/dropbear_%.bbappend    |  3 ---
 .../packagegroups/packagegroup-resin.bbappend    |  3 +++
 .../resin-vars/resin-vars/resin-vars             |  6 ------
 .../resinhup/resinhup/run-resinhup.sh            |  2 ++
 7 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 meta-hassio/classes/resin-connectable-service.bbclass
 create mode 100644 meta-hassio/recipes-core/packagegroups/packagegroup-resin.bbappend

diff --git a/meta-hassio/classes/resin-connectable-service.bbclass b/meta-hassio/classes/resin-connectable-service.bbclass
new file mode 100644
index 000000000..d5798afb4
--- /dev/null
+++ b/meta-hassio/classes/resin-connectable-service.bbclass
@@ -0,0 +1,16 @@
+# resin-connectable-service bbclass
+#
+# Author: Andrei Gherzan <andrei@resin.io>
+
+python __anonymous() {
+    # Enable/disable systemd services listed in RESIN_CONNECTABLE_SERVICES based on
+    # RESIN_CONNECTABLE_ENABLE_SERVICES
+
+    pn = d.getVar('PN', True)
+    services = d.getVar('RESIN_CONNECTABLE_SERVICES', True).split()
+
+    if pn in services:
+        d.setVar('SYSTEMD_AUTO_ENABLE', 'enable')
+
+}
+systemd_populate_packages[vardeps] += "RESIN_CONNECTABLE_ENABLE_SERVICES"
diff --git a/meta-hassio/conf/distro/hassio.conf b/meta-hassio/conf/distro/hassio.conf
index 07418abdb..14fb04380 100644
--- a/meta-hassio/conf/distro/hassio.conf
+++ b/meta-hassio/conf/distro/hassio.conf
@@ -3,3 +3,4 @@ require conf/distro/include/resin-os.inc
 
 PREFERRED_PROVIDER_docker-disk = "docker-resin-supervisor-disk"
 RESIN_CONNECTABLE_SERVICES_remove = "openvpn"
+DISTRO_FEATURES_remove = "development-image"
diff --git a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/update-resin-supervisor b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/update-resin-supervisor
index 955c8a953..3a3af78be 100644
--- a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/update-resin-supervisor
+++ b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/update-resin-supervisor
@@ -51,6 +51,7 @@ done
 
 # Don't souce before parsing args - resin-vars parses args too
 source /usr/sbin/resin-vars
+source /etc/resin-supervisor/supervisor.conf
 
 # A temporary file used until next reboot
 UPDATECONF=/tmp/update-supervisor.conf
diff --git a/meta-hassio/recipes-core/dropbear/dropbear_%.bbappend b/meta-hassio/recipes-core/dropbear/dropbear_%.bbappend
index 18a0fda4a..7a97dd161 100644
--- a/meta-hassio/recipes-core/dropbear/dropbear_%.bbappend
+++ b/meta-hassio/recipes-core/dropbear/dropbear_%.bbappend
@@ -16,9 +16,6 @@ FILES_${PN} += " \
 do_install_append() {
     mkdir -p ${D}/home/root/.ssh
 
-    install -d ${D}${sysconfdir}/default
-    sed -i '/DROPBEAR_EXTRA_ARGS="-g"/d' ${D}/etc/default/dropbear
-
     install -d ${D}${bindir}
     install -m 0755 ${WORKDIR}/sync-authorized-keys.sh ${D}${bindir}
 
diff --git a/meta-hassio/recipes-core/packagegroups/packagegroup-resin.bbappend b/meta-hassio/recipes-core/packagegroups/packagegroup-resin.bbappend
new file mode 100644
index 000000000..7df350d7b
--- /dev/null
+++ b/meta-hassio/recipes-core/packagegroups/packagegroup-resin.bbappend
@@ -0,0 +1,3 @@
+
+RDEPENDS_${PN}.remove = "resin-connectable"
+RDEPENDS_${PN}.remove = "resin-provisioner"
diff --git a/meta-hassio/recipes-support/resin-vars/resin-vars/resin-vars b/meta-hassio/recipes-support/resin-vars/resin-vars/resin-vars
index 5dd52c8a0..977241c1f 100644
--- a/meta-hassio/recipes-support/resin-vars/resin-vars/resin-vars
+++ b/meta-hassio/recipes-support/resin-vars/resin-vars/resin-vars
@@ -42,12 +42,6 @@ if [ -z "$CONFIG_PATH" ]; then
     CONFIG_PATH=$BOOT_MOUNTPOINT/config.json
 fi
 
-# Resin supervisor variables
-source /etc/resin-supervisor/supervisor.conf
-
-# ResinOS variables
-source /etc/hassio.conf
-
 # If config.json provides redefinitions for our vars let us rewrite their
 # runtime value
 if [ -f $CONFIG_PATH ]
diff --git a/meta-hassio/recipes-support/resinhup/resinhup/run-resinhup.sh b/meta-hassio/recipes-support/resinhup/resinhup/run-resinhup.sh
index 7e4cd4505..a43a75bf8 100644
--- a/meta-hassio/recipes-support/resinhup/resinhup/run-resinhup.sh
+++ b/meta-hassio/recipes-support/resinhup/resinhup/run-resinhup.sh
@@ -13,6 +13,8 @@ source /etc/profile
 
 # load config
 source /usr/sbin/resin-vars
+source /etc/resin-supervisor/supervisor.conf
+source /etc/hassio.conf
 
 # Help function
 function help {