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-contrib-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 e5c61b755e3..00000000000 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Conflicts=dropbear.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target -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 59ed07b6d07..00000000000 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=SSH Per-Connection Server -Requires=dropbearkey.service -After=syslog.target dropbearkey.service - -[Service] -EnvironmentFile=-/etc/default/dropbear -ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 $DROPBEAR_EXTRA_ARGS -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket -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 7f03000ebc9..00000000000 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=SSH Key Generation -ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key - -[Service] -ExecStart=/usr/sbin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key -RemainAfterExit=yes - -[Install] -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 fc18ea8e320..181b8784dd3 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 @@ -inherit systemd - -# look for files in the layer first -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://dropbearkey.service \ - file://dropbear@.service \ - file://dropbear.socket" - RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dropbear.socket" -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system - ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service -} |