From 036f375f061baa49e404bfe4724e1d9f575cc637 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Thu, 23 Mar 2017 23:07:54 +0100
Subject: [PATCH] change to resin style

---
 meta-hassio/recipes-core/dropbear/dropbear_%.bbappend         | 4 ++--
 .../files/{sync-authorized-keys.sh => sync-authorized-keys}   | 2 ++
 .../recipes-core/dropbear/files/sync-authorized-keys.service  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename meta-hassio/recipes-core/dropbear/files/{sync-authorized-keys.sh => sync-authorized-keys} (96%)

diff --git a/meta-hassio/recipes-core/dropbear/dropbear_%.bbappend b/meta-hassio/recipes-core/dropbear/dropbear_%.bbappend
index 7bb8f09c6..a791c9be0 100644
--- a/meta-hassio/recipes-core/dropbear/dropbear_%.bbappend
+++ b/meta-hassio/recipes-core/dropbear/dropbear_%.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += " \
-    file://sync-authorized-keys.sh \
+    file://sync-authorized-keys \
     file://sync-authorized-keys.service \
     "
 
@@ -17,7 +17,7 @@ do_install_append() {
     install -d ${D}/home/root/.ssh
 
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/sync-authorized-keys.sh ${D}${bindir}
+    install -m 0755 ${WORKDIR}/sync-authorized-keys ${D}${bindir}
 
     if [ "${RESIN_CONNECTABLE_ENABLE_SERVICES}" = "1" ]; then
         rm -fr ${D}${localstatedir}/lib/dropbear/
diff --git a/meta-hassio/recipes-core/dropbear/files/sync-authorized-keys.sh b/meta-hassio/recipes-core/dropbear/files/sync-authorized-keys
similarity index 96%
rename from meta-hassio/recipes-core/dropbear/files/sync-authorized-keys.sh
rename to meta-hassio/recipes-core/dropbear/files/sync-authorized-keys
index 51b229b90..8905bf7e6 100644
--- a/meta-hassio/recipes-core/dropbear/files/sync-authorized-keys.sh
+++ b/meta-hassio/recipes-core/dropbear/files/sync-authorized-keys
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 BOOT_SSH_KEY=/mnt/boot/authorized_keys
 HOME_SSH_KEY=/home/root/.ssh/authorized_keys
 
diff --git a/meta-hassio/recipes-core/dropbear/files/sync-authorized-keys.service b/meta-hassio/recipes-core/dropbear/files/sync-authorized-keys.service
index 2804f386d..9767176b3 100644
--- a/meta-hassio/recipes-core/dropbear/files/sync-authorized-keys.service
+++ b/meta-hassio/recipes-core/dropbear/files/sync-authorized-keys.service
@@ -6,7 +6,8 @@ Before=etc-dropbear.mount
 
 [Service]
 Type=oneshot
-ExecStart=@BASE_BINDIR@/bash @BINDIR@/sync-authorized-keys.sh
+RemainAfterExit=yes
+ExecStart=@BASE_BINDIR@/bash @BINDIR@/sync-authorized-keys
 
 [Install]
 WantedBy=multi-user.target