From 4f568b44c6ff4e1cb47006efca2e3233035d9c77 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Thu, 23 Apr 2020 15:12:04 +0100 Subject: openssh: Move sshdgenkeys.service to sshd.socket sshd.socket launches the templated sshd@.service, so by moving the sshdgenkeys.service to sshd.socket, key generation can start in advance of a connection. (From OE-Core rev: af38a39b4bed9e43c5075008be47ca72191a489e) Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssh/openssh/sshd.socket | 1 + meta/recipes-connectivity/openssh/openssh/sshd@.service | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/recipes-connectivity/openssh') diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.socket b/meta/recipes-connectivity/openssh/openssh/sshd.socket index 12c39b26b5..8d76d62309 100644 --- a/meta/recipes-connectivity/openssh/openssh/sshd.socket +++ b/meta/recipes-connectivity/openssh/openssh/sshd.socket @@ -1,5 +1,6 @@ [Unit] Conflicts=sshd.service +Wants=sshdgenkeys.service [Socket] ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd diff --git a/meta/recipes-connectivity/openssh/openssh/sshd@.service b/meta/recipes-connectivity/openssh/openssh/sshd@.service index 9d83dfb2bb..422450c7a1 100644 --- a/meta/recipes-connectivity/openssh/openssh/sshd@.service +++ b/meta/recipes-connectivity/openssh/openssh/sshd@.service @@ -1,13 +1,11 @@ [Unit] Description=OpenSSH Per-Connection Daemon -Wants=sshdgenkeys.service After=sshdgenkeys.service [Service] Environment="SSHD_OPTS=" EnvironmentFile=-/etc/default/ssh ExecStart=-@SBINDIR@/sshd -i $SSHD_OPTS -ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID StandardInput=socket StandardError=syslog KillMode=process -- cgit v1.2.3-54-g00ecf