From de26d190791d5acc730a701898ed63edfa7fb193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
Date: Sat, 7 May 2016 23:05:55 +0200
Subject: [PATCH] Start dropbear by systemd unit if systemd is enabled.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The hook scripts are not run in systemd mode, so a systemd unit is
required. This adds a custom unit that has the right ordering and
command line to start dropbear before the crypto setup step.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
---
 dropbear.service | 11 +++++++++++
 dropbear_install |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 dropbear.service

diff --git a/dropbear.service b/dropbear.service
new file mode 100644
index 0000000..af0af02
--- /dev/null
+++ b/dropbear.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dropbear SSH Daemon
+DefaultDependencies=no
+Before=cryptsetup.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/dropbear -F -s -j -k
+
+[Install]
+WantedBy=cryptsetup.target
diff --git a/dropbear_install b/dropbear_install
index 40a5116..7ef3a75 100644
--- a/dropbear_install
+++ b/dropbear_install
@@ -92,7 +92,14 @@ build ()
   add_dir "/var/log"
   touch "${BUILDROOT}"/var/log/lastlog
 
-  add_runscript
+  #systemd enabled
+  declare -F add_systemd_unit > /dev/null 2>&1
+  if [ $? -eq 0 ]; then
+      add_file "/usr/share/mkinitcpio-dropbear/dropbear.service" "/etc/systemd/system/dropbear.service"
+      systemctl --root "$BUILDROOT" enable dropbear.service
+  else
+      add_runscript
+  fi
 }
 
 help ()