summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-06-10 21:46:52 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-07-16 09:39:07 +0200
commit855e8d63a67aee347296e17e596d45be0d75ac9d (patch)
tree9ea008f6645993cc305a5737dd536cf3f29f3595 /meta-oe/recipes-connectivity
parentc203043683deff90b4d80c326bf6b27a28a59386 (diff)
downloadmeta-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/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/openssh/openssh/sshd.socket11
-rw-r--r--meta-oe/recipes-connectivity/openssh/openssh/sshd@.service9
-rw-r--r--meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service10
-rw-r--r--meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend10
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 753a33b39..000000000
--- a/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket
+++ /dev/null
@@ -1,11 +0,0 @@
1[Unit]
2Conflicts=sshd.service
3
4[Socket]
5ExecStartPre=/bin/mkdir -p /var/run/sshd
6ListenStream=22
7Accept=yes
8
9[Install]
10WantedBy=sockets.target
11Also=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 d118490bd..000000000
--- a/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service
+++ /dev/null
@@ -1,9 +0,0 @@
1[Unit]
2Description=OpenSSH Per-Connection Daemon
3After=sshdgenkeys.service
4
5[Service]
6ExecStart=-/usr/sbin/sshd -i
7ExecReload=/bin/kill -HUP $MAINPID
8StandardInput=socket
9StandardError=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 c717214c5..000000000
--- a/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service
+++ /dev/null
@@ -1,10 +0,0 @@
1[Unit]
2Description=SSH Key Generation
3
4[Service]
5ExecStart=/usr/bin/ssh-keygen -A
6Type=oneshot
7RemainAfterExit=yes
8
9[Install]
10WantedBy=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 de7668fb5..000000000
--- a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3PRINC := "${@int(PRINC) + 2}"
4
5SYSTEMD_PACKAGES = "openssh-sshd-systemd"
6SYSTEMD_SERVICE = "sshd.socket"
7
8inherit systemd
9
10SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service"