diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-08-10 17:14:41 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-13 23:28:04 +0200 |
commit | 4b8bb9992ad3957076f351db6446702fd72773fd (patch) | |
tree | 8fc125a44f86911ea57633a41645a00d7635c12d /meta-systemd | |
parent | 7bb14206a25505cb70e78b1858a4d37a3e847b07 (diff) | |
download | meta-openembedded-4b8bb9992ad3957076f351db6446702fd72773fd.tar.gz |
dropbear: systemd support now in OE-Core
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd')
4 files changed, 0 insertions, 48 deletions
diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket deleted file mode 100644 index e5c61b755..000000000 --- a/meta-systemd/oe-core/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-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear@.service b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear@.service deleted file mode 100644 index 59ed07b6d..000000000 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear@.service +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=SSH Per-Connection Server | ||
3 | Requires=dropbearkey.service | ||
4 | After=syslog.target dropbearkey.service | ||
5 | |||
6 | [Service] | ||
7 | EnvironmentFile=-/etc/default/dropbear | ||
8 | ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 $DROPBEAR_EXTRA_ARGS | ||
9 | ExecReload=/bin/kill -HUP $MAINPID | ||
10 | StandardInput=socket | ||
11 | KillMode=process | ||
diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service deleted file mode 100644 index 7f03000eb..000000000 --- a/meta-systemd/oe-core/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-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend b/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend index fc18ea8e3..181b8784d 100644 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend +++ b/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend | |||
@@ -1,21 +1,4 @@ | |||
1 | inherit systemd | ||
2 | |||
3 | # look for files in the layer first | ||
4 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
5 | |||
6 | SRC_URI += "file://dropbearkey.service \ | ||
7 | file://dropbear@.service \ | ||
8 | file://dropbear.socket" | ||
9 | |||
10 | RPROVIDES_${PN} += "${PN}-systemd" | 1 | RPROVIDES_${PN} += "${PN}-systemd" |
11 | RREPLACES_${PN} += "${PN}-systemd" | 2 | RREPLACES_${PN} += "${PN}-systemd" |
12 | RCONFLICTS_${PN} += "${PN}-systemd" | 3 | RCONFLICTS_${PN} += "${PN}-systemd" |
13 | SYSTEMD_SERVICE_${PN} = "dropbear.socket" | ||
14 | 4 | ||
15 | do_install_append() { | ||
16 | install -d ${D}${systemd_unitdir}/system | ||
17 | install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system | ||
18 | install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_unitdir}/system | ||
19 | install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system | ||
20 | ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service | ||
21 | } | ||