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:48:24 +0000 |
| commit | 4379e6f3096c893db5fa6a0b4569a0440e4494fe (patch) | |
| tree | 7e384949d50848992d4c7b13280909ddc83683f0 | |
| parent | 5d90c5ebdb899b2951c97a94ff57867c1e491c15 (diff) | |
| download | openembedded-core-4379e6f3096c893db5fa6a0b4569a0440e4494fe.tar.gz openembedded-core-4379e6f3096c893db5fa6a0b4569a0440e4494fe.tar.bz2 openembedded-core-4379e6f3096c893db5fa6a0b4569a0440e4494fe.zip | |
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.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
4 files changed, 7 insertions, 7 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 [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 diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb index c61d16f6c6..1f78566c6c 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb @@ -44,7 +44,7 @@ INITSCRIPT_NAME_${PN}-sshd = "sshd" INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9" SYSTEMD_PACKAGES = "${PN}-sshd" -SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket sshd@.service sshdgenkeys.service" +SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers" @@ -114,7 +114,7 @@ ALLOW_EMPTY_${PN} = "1" PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" FILES_${PN}-scp = "${bindir}/scp.${BPN}" FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" -FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd" +FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd" FILES_${PN}-sftp = "${bindir}/sftp" FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" |