summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-04-23 15:12:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-26 14:00:50 +0100
commit4f568b44c6ff4e1cb47006efca2e3233035d9c77 (patch)
tree5cd344cade17102570c5ffed61057b2cfa0b8d64
parentdf77ee47237244f400da4de62f201a55ec1a8f8d (diff)
downloadpoky-4f568b44c6ff4e1cb47006efca2e3233035d9c77.tar.gz
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 <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssh/openssh/sshd.socket1
-rw-r--r--meta/recipes-connectivity/openssh/openssh/sshd@.service2
2 files changed, 1 insertions, 2 deletions
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 @@
1[Unit] 1[Unit]
2Conflicts=sshd.service 2Conflicts=sshd.service
3Wants=sshdgenkeys.service
3 4
4[Socket] 5[Socket]
5ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd 6ExecStartPre=@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 @@
1[Unit] 1[Unit]
2Description=OpenSSH Per-Connection Daemon 2Description=OpenSSH Per-Connection Daemon
3Wants=sshdgenkeys.service
4After=sshdgenkeys.service 3After=sshdgenkeys.service
5 4
6[Service] 5[Service]
7Environment="SSHD_OPTS=" 6Environment="SSHD_OPTS="
8EnvironmentFile=-/etc/default/ssh 7EnvironmentFile=-/etc/default/ssh
9ExecStart=-@SBINDIR@/sshd -i $SSHD_OPTS 8ExecStart=-@SBINDIR@/sshd -i $SSHD_OPTS
10ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
11StandardInput=socket 9StandardInput=socket
12StandardError=syslog 10StandardError=syslog
13KillMode=process 11KillMode=process