diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2023-06-02 09:07:56 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-06-13 04:00:11 -1000 |
commit | 733d919af4714845c3a3d64d60c24874881077b3 (patch) | |
tree | af2ea394d367feceddd60a157be92d0e44820b1d | |
parent | f42e2c212f469f127c64ca352140ab2234a1d956 (diff) | |
download | poky-733d919af4714845c3a3d64d60c24874881077b3.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: 96798603273bbab40a7e19bbb67a9a5398648c21)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit af38a39b4bed9e43c5075008be47ca72191a489e)
Signed-off-by: Jermain Horsman <jermain.horsman@nedap.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/sshd.socket | 1 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/sshd@.service | 2 |
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] |
2 | Conflicts=sshd.service | 2 | Conflicts=sshd.service |
3 | Wants=sshdgenkeys.service | ||
3 | 4 | ||
4 | [Socket] | 5 | [Socket] |
5 | ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd | 6 | 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 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Description=OpenSSH Per-Connection Daemon | 2 | Description=OpenSSH Per-Connection Daemon |
3 | Wants=sshdgenkeys.service | ||
4 | After=sshdgenkeys.service | 3 | After=sshdgenkeys.service |
5 | 4 | ||
6 | [Service] | 5 | [Service] |
7 | Environment="SSHD_OPTS=" | 6 | Environment="SSHD_OPTS=" |
8 | EnvironmentFile=-/etc/default/ssh | 7 | EnvironmentFile=-/etc/default/ssh |
9 | ExecStart=-@SBINDIR@/sshd -i $SSHD_OPTS | 8 | ExecStart=-@SBINDIR@/sshd -i $SSHD_OPTS |
10 | ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID | ||
11 | StandardInput=socket | 9 | StandardInput=socket |
12 | StandardError=syslog | 10 | StandardError=syslog |
13 | KillMode=process | 11 | KillMode=process |