From dbfcfbfeb28a3257c629e6ebaf3399da4b7aa087 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 16 Jan 2014 22:03:22 -0500 Subject: openssh: fixes for systemd This patch contains a few fixes for the systemd unit files of openssh. The fixes use the same unit files in Fedora 20 as a reference. 1) Remove sshdgenkeys.service and sshd@.service from SYSTEMD_SERVICE. 2) Fix the dependency and logic of sshdgenkeys.service. (From OE-Core rev: 4379e6f3096c893db5fa6a0b4569a0440e4494fe) Signed-off-by: Chen Qi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket | 1 - meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service | 1 + .../openssh/openssh-6.4p1/sshdgenkeys.service | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-connectivity/openssh/openssh-6.4p1') diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket index d19ab2ac43..12c39b26b5 100644 --- a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket +++ b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket @@ -8,4 +8,3 @@ Accept=yes [Install] WantedBy=sockets.target -Also=sshdgenkeys.service diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service index 64e009ff00..4eda6592f5 100644 --- a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service +++ b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service @@ -1,5 +1,6 @@ [Unit] Description=OpenSSH Per-Connection Daemon +Wants=sshdgenkeys.service After=sshdgenkeys.service [Service] diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service index 2fd8a9aaf2..c21d70baf0 100644 --- a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service +++ b/meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service @@ -1,10 +1,10 @@ [Unit] -Description=SSH Key Generation +Description=OpenSSH Key Generation +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key [Service] ExecStart=@BINDIR@/ssh-keygen -A Type=oneshot RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf