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-systemd/meta-oe | |
| parent | c203043683deff90b4d80c326bf6b27a28a59386 (diff) | |
| download | meta-openembedded-contrib-855e8d63a67aee347296e17e596d45be0d75ac9d.tar.gz | |
openssh: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-systemd/meta-oe')
4 files changed, 40 insertions, 0 deletions
diff --git a/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket new file mode 100644 index 0000000000..753a33b393 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket @@ -0,0 +1,11 @@ +[Unit] +Conflicts=sshd.service + +[Socket] +ExecStartPre=/bin/mkdir -p /var/run/sshd +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target +Also=sshdgenkeys.service diff --git a/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service new file mode 100644 index 0000000000..d118490bdb --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service @@ -0,0 +1,9 @@ +[Unit] +Description=OpenSSH Per-Connection Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=-/usr/sbin/sshd -i +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +StandardError=syslog diff --git a/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service new file mode 100644 index 0000000000..c717214c55 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service @@ -0,0 +1,10 @@ +[Unit] +Description=SSH Key Generation + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend new file mode 100644 index 0000000000..a708a36c1c --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 3}" + +SYSTEMD_PACKAGES = "openssh-sshd-systemd" +SYSTEMD_SERVICE = "sshd.socket" + +inherit systemd + +SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service" |