diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-10 21:46:56 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:07 +0200 |
| commit | 0cee7e28f0ad77c8da7067eda7794cdd4576c7e2 (patch) | |
| tree | fa60324b095f3d1eeee83c92a44d9d44f5ca303c /meta-oe/recipes-core | |
| parent | 42e00e8ffd3088050716a5fe1c7da2cc6cf9787c (diff) | |
| download | meta-openembedded-0cee7e28f0ad77c8da7067eda7794cdd4576c7e2.tar.gz | |
dropbear: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-core')
4 files changed, 0 insertions, 46 deletions
diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket b/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket deleted file mode 100644 index e5c61b755e..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Conflicts=dropbear.service | ||
| 3 | |||
| 4 | [Socket] | ||
| 5 | ListenStream=22 | ||
| 6 | Accept=yes | ||
| 7 | |||
| 8 | [Install] | ||
| 9 | WantedBy=sockets.target | ||
| 10 | Also=dropbearkey.service | ||
diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service b/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service deleted file mode 100644 index 4fba3f05c8..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=SSH Per-Connection Server | ||
| 3 | Requires=dropbearkey.service | ||
| 4 | After=syslog.target dropbearkey.service | ||
| 5 | |||
| 6 | [Service] | ||
| 7 | ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 | ||
| 8 | ExecReload=/bin/kill -HUP $MAINPID | ||
| 9 | StandardInput=socket | ||
diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service deleted file mode 100644 index 7f03000ebc..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=SSH Key Generation | ||
| 3 | ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key | ||
| 4 | |||
| 5 | [Service] | ||
| 6 | ExecStart=/usr/sbin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key | ||
| 7 | RemainAfterExit=yes | ||
| 8 | |||
| 9 | [Install] | ||
| 10 | WantedBy=multi-user.target | ||
diff --git a/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend b/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend deleted file mode 100644 index fc5d0476a6..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | inherit systemd | ||
| 2 | |||
| 3 | PRINC := "${@int(PRINC) + 2}" | ||
| 4 | |||
| 5 | # look for files in the layer first | ||
| 6 | FILESEXTRAPATHS := "${THISDIR}/${PN}" | ||
| 7 | |||
| 8 | SRC_URI += "file://dropbearkey.service \ | ||
| 9 | file://dropbear@.service \ | ||
| 10 | file://dropbear.socket" | ||
| 11 | |||
| 12 | SYSTEMD_PACKAGES = "${PN}-systemd" | ||
| 13 | SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket" | ||
| 14 | |||
| 15 | do_install_append() { | ||
| 16 | ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service | ||
| 17 | } | ||
