From cf1dcbe16d8f2542dc95c6ff0ad093582329da87 Mon Sep 17 00:00:00 2001
From: Thomas Klaehn <thomas.klaehn@perinet.io>
Date: Fri, 31 Jan 2020 13:28:54 +0100
Subject: [PATCH] tiny-image(s): exchange openssh server with dropbear

---
 recipes-connectivity/openssh/openssh_%.bbappend  |  9 ---------
 recipes-containers/docker/docker-ce_git.bbappend | 10 +++++++++-
 recipes-containers/docker/files/daemon.json      |  5 +++++
 recipes-core/busybox/busybox-initcfg.bb          |  1 +
 recipes-core/images/tiny-image-base.inc          |  4 +---
 5 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 recipes-connectivity/openssh/openssh_%.bbappend
 create mode 100644 recipes-containers/docker/files/daemon.json

diff --git a/recipes-connectivity/openssh/openssh_%.bbappend b/recipes-connectivity/openssh/openssh_%.bbappend
deleted file mode 100644
index d5a9e23..0000000
--- a/recipes-connectivity/openssh/openssh_%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-do_install_append () {
-        install -d ${D}${sysconfdir}/
-        install -d ${D}${sysconfdir}/rcS.d/
-
-        cd ${D}${sysconfdir}/rcS.d/
-        ln -s ../init.d/sshd S47sshd.sh
-
-}
-
diff --git a/recipes-containers/docker/docker-ce_git.bbappend b/recipes-containers/docker/docker-ce_git.bbappend
index fe6fae9..34d9fe9 100644
--- a/recipes-containers/docker/docker-ce_git.bbappend
+++ b/recipes-containers/docker/docker-ce_git.bbappend
@@ -1,5 +1,13 @@
 LICENSE = "GPLv2"
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRC_URI += " file://docker.init"
+SRC_URI += " \
+    file://docker.init \
+    file://daemon.json \
+"
 
+do_install_append() {
+    install -d ${D}${sysconfdir}/
+    install -d ${D}${sysconfdir}/docker/
+    install -m 0600 ${WORKDIR}/daemon.json ${D}${sysconfdir}/docker/
+}
diff --git a/recipes-containers/docker/files/daemon.json b/recipes-containers/docker/files/daemon.json
new file mode 100644
index 0000000..292aa99
--- /dev/null
+++ b/recipes-containers/docker/files/daemon.json
@@ -0,0 +1,5 @@
+{
+  "ipv6": true,
+  "fixed-cidr-v6": "2001:db8:1::/64"
+}
+
diff --git a/recipes-core/busybox/busybox-initcfg.bb b/recipes-core/busybox/busybox-initcfg.bb
index 36d28ca..30966bc 100644
--- a/recipes-core/busybox/busybox-initcfg.bb
+++ b/recipes-core/busybox/busybox-initcfg.bb
@@ -22,6 +22,7 @@ do_install_append () {
 
         cd ${D}${sysconfdir}/rcS.d/
         ln -s ../init.d/networking S40networking.sh
+	ln -s ../init.d/dropbear S47dropbear.sh
         ln -s ../init.d/ntpd S48ntpd.sh
         ln -s ../init.d/docker.init S50docker.sh
 }
diff --git a/recipes-core/images/tiny-image-base.inc b/recipes-core/images/tiny-image-base.inc
index 88e05b4..d3023c2 100644
--- a/recipes-core/images/tiny-image-base.inc
+++ b/recipes-core/images/tiny-image-base.inc
@@ -6,9 +6,7 @@ IMAGE_FEATURES += "package-management"
 
 CORE_OS = " \
 	busybox-initcfg \
-	openssh \
-	openssh-keygen \
-	openssh-sftp-server \
+	dropbear \
 	psplash \
 	tzdata \
 "