2 files changed, 37 insertions, 0 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-core/dropbear/dropbear_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/dropbear/dropbear_%.bbappend
new file mode 100644
index 000000000..cfa1d0711
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/dropbear/dropbear_%.bbappend
@@ -0,0 +1,22 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://enable-ssh.sh"
+
+add_manual_ssh_enable() {
+   install -d ${D}/usr/share/misc
+   install -m 0755 ${D}/${systemd_unitdir}/system/dropbear@.service ${D}/usr/share/misc/dropbear@.service
+   install -m 0755 ${D}/${systemd_unitdir}/system/dropbear.socket ${D}/usr/share/misc/dropbear.socket
+   install -m 0755 ${WORKDIR}/enable-ssh.sh ${D}${bindir}/enable-ssh.sh
+   # Remove dropbear service and socket by default, if debug-tweaks is disabled
+   rm ${D}/${systemd_unitdir}/system/dropbear@.service
+   rm ${D}/${systemd_unitdir}/system/dropbear.socket
+}
+
+do_install_append() {
+   # Add manual ssh enable script if debug-tweaks is disabled
+   ${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'debug-tweaks', '', 'add_manual_ssh_enable', d)}
+}
+
+FILES_${PN} += "/usr/share/misc"
+SYSTEMD_SERVICE_${PN} += "dropbearkey.service"
+SYSTEMD_SERVICE_${PN}_remove += " ${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'debug-tweaks', '', 'dropbear.socket', d)}"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/dropbear/files/enable-ssh.sh b/meta-openbmc-mods/meta-common/recipes-core/dropbear/files/enable-ssh.sh
new file mode 100755
index 000000000..e97995cc1
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/dropbear/files/enable-ssh.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ -e /etc/systemd/system/dropbear@.service ] && \
+   [ -e /etc/systemd/system/sockets.target.wants/dropbear.socket ]
+then
+    echo "SSH is already enabled"
+else
+    cp /usr/share/misc/dropbear@.service /etc/systemd/system/dropbear@.service
+    cp /usr/share/misc/dropbear.socket /etc/systemd/system/dropbear.socket
+    ln -s  /etc/systemd/system/dropbear.socket /etc/systemd/system/sockets.target.wants/dropbear.socket
+    groupmems -g priv-admin -a root
+    systemctl daemon-reload
+    systemctl restart dropbear.socket
+    echo "Enabled SSH service for root user successful"
+fi