diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-01-16 22:03:22 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 00:52:31 +0000 |
commit | dbfcfbfeb28a3257c629e6ebaf3399da4b7aa087 (patch) | |
tree | e649f2354d5b688a6b21f013c9020478d80fc95d /meta/recipes-connectivity/openssh/openssh-6.4p1 | |
parent | ab2e677df0a95dc52b32401fa77f63710f346c54 (diff) | |
download | poky-dbfcfbfeb28a3257c629e6ebaf3399da4b7aa087.tar.gz |
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 <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh-6.4p1')
3 files changed, 5 insertions, 5 deletions
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 | |||
8 | 8 | ||
9 | [Install] | 9 | [Install] |
10 | WantedBy=sockets.target | 10 | WantedBy=sockets.target |
11 | 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 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Description=OpenSSH Per-Connection Daemon | 2 | Description=OpenSSH Per-Connection Daemon |
3 | Wants=sshdgenkeys.service | ||
3 | After=sshdgenkeys.service | 4 | After=sshdgenkeys.service |
4 | 5 | ||
5 | [Service] | 6 | [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 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Description=SSH Key Generation | 2 | Description=OpenSSH Key Generation |
3 | ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key | ||
4 | ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key | ||
5 | ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key | ||
3 | 6 | ||
4 | [Service] | 7 | [Service] |
5 | ExecStart=@BINDIR@/ssh-keygen -A | 8 | ExecStart=@BINDIR@/ssh-keygen -A |
6 | Type=oneshot | 9 | Type=oneshot |
7 | RemainAfterExit=yes | 10 | RemainAfterExit=yes |
8 | |||
9 | [Install] | ||
10 | WantedBy=multi-user.target | ||