diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-10 21:46:52 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:07 +0200 |
| commit | 855e8d63a67aee347296e17e596d45be0d75ac9d (patch) | |
| tree | 9ea008f6645993cc305a5737dd536cf3f29f3595 /meta-oe | |
| parent | c203043683deff90b4d80c326bf6b27a28a59386 (diff) | |
| download | meta-openembedded-855e8d63a67aee347296e17e596d45be0d75ac9d.tar.gz | |
openssh: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe')
4 files changed, 0 insertions, 40 deletions
diff --git a/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket b/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket deleted file mode 100644 index 753a33b393..0000000000 --- a/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Conflicts=sshd.service | ||
| 3 | |||
| 4 | [Socket] | ||
| 5 | ExecStartPre=/bin/mkdir -p /var/run/sshd | ||
| 6 | ListenStream=22 | ||
| 7 | Accept=yes | ||
| 8 | |||
| 9 | [Install] | ||
| 10 | WantedBy=sockets.target | ||
| 11 | Also=sshdgenkeys.service | ||
diff --git a/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service b/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service deleted file mode 100644 index d118490bdb..0000000000 --- a/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=OpenSSH Per-Connection Daemon | ||
| 3 | After=sshdgenkeys.service | ||
| 4 | |||
| 5 | [Service] | ||
| 6 | ExecStart=-/usr/sbin/sshd -i | ||
| 7 | ExecReload=/bin/kill -HUP $MAINPID | ||
| 8 | StandardInput=socket | ||
| 9 | StandardError=syslog | ||
diff --git a/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service deleted file mode 100644 index c717214c55..0000000000 --- a/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=SSH Key Generation | ||
| 3 | |||
| 4 | [Service] | ||
| 5 | ExecStart=/usr/bin/ssh-keygen -A | ||
| 6 | Type=oneshot | ||
| 7 | RemainAfterExit=yes | ||
| 8 | |||
| 9 | [Install] | ||
| 10 | WantedBy=multi-user.target | ||
diff --git a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend deleted file mode 100644 index de7668fb54..0000000000 --- a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
| 2 | |||
| 3 | PRINC := "${@int(PRINC) + 2}" | ||
| 4 | |||
| 5 | SYSTEMD_PACKAGES = "openssh-sshd-systemd" | ||
| 6 | SYSTEMD_SERVICE = "sshd.socket" | ||
| 7 | |||
| 8 | inherit systemd | ||
| 9 | |||
| 10 | SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service" | ||
