mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 03:49:32 +02:00
dropbear: add systemd unit files
This patch mainly comes from meta-systemd with a few modifications. The purpose is to get rid of the LSB init scripts in systemd images. [YOCTO #4420] (From OE-Core rev: 5d90c5ebdb899b2951c97a94ff57867c1e491c15) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -19,17 +19,22 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
|
|||||||
file://0004-fix-2kb-keys.patch \
|
file://0004-fix-2kb-keys.patch \
|
||||||
file://0007-dropbear-fix-for-x32-abi.patch \
|
file://0007-dropbear-fix-for-x32-abi.patch \
|
||||||
file://init \
|
file://init \
|
||||||
|
file://dropbearkey.service \
|
||||||
|
file://dropbear@.service \
|
||||||
|
file://dropbear.socket \
|
||||||
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
|
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
|
||||||
|
|
||||||
PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
|
PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
|
||||||
file://0006-dropbear-configuration-file.patch \
|
file://0006-dropbear-configuration-file.patch \
|
||||||
file://dropbear"
|
file://dropbear"
|
||||||
|
|
||||||
inherit autotools update-rc.d
|
inherit autotools update-rc.d systemd
|
||||||
|
|
||||||
INITSCRIPT_NAME = "dropbear"
|
INITSCRIPT_NAME = "dropbear"
|
||||||
INITSCRIPT_PARAMS = "defaults 10"
|
INITSCRIPT_PARAMS = "defaults 10"
|
||||||
|
|
||||||
|
SYSTEMD_SERVICE_${PN} = "dropbear.socket"
|
||||||
|
|
||||||
CFLAGS_prepend = " -I. "
|
CFLAGS_prepend = " -I. "
|
||||||
LD = "${CC}"
|
LD = "${CC}"
|
||||||
|
|
||||||
@@ -66,6 +71,16 @@ do_install() {
|
|||||||
install -d ${D}${sysconfdir}/pam.d
|
install -d ${D}${sysconfdir}/pam.d
|
||||||
install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/
|
install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# deal with systemd unit files
|
||||||
|
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
|
||||||
|
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
|
||||||
|
-e 's,@BINDIR@,${bindir},g' \
|
||||||
|
-e 's,@SBINDIR@,${sbindir},g' \
|
||||||
|
${D}${systemd_unitdir}/system/dropbear.socket ${D}${systemd_unitdir}/system/*.service
|
||||||
}
|
}
|
||||||
|
|
||||||
inherit update-alternatives
|
inherit update-alternatives
|
||||||
|
|||||||
10
meta/recipes-core/dropbear/dropbear/dropbear.socket
Normal file
10
meta/recipes-core/dropbear/dropbear/dropbear.socket
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
[Unit]
|
||||||
|
Conflicts=dropbear.service
|
||||||
|
|
||||||
|
[Socket]
|
||||||
|
ListenStream=22
|
||||||
|
Accept=yes
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sockets.target
|
||||||
|
Also=dropbearkey.service
|
||||||
11
meta/recipes-core/dropbear/dropbear/dropbear@.service
Normal file
11
meta/recipes-core/dropbear/dropbear/dropbear@.service
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=SSH Per-Connection Server
|
||||||
|
Wants=dropbearkey.service
|
||||||
|
After=syslog.target dropbearkey.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
EnvironmentFile=-/etc/default/dropbear
|
||||||
|
ExecStart=-@SBINDIR@/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key $DROPBEAR_EXTRA_ARGS
|
||||||
|
ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
|
||||||
|
StandardInput=socket
|
||||||
|
KillMode=process
|
||||||
8
meta/recipes-core/dropbear/dropbear/dropbearkey.service
Normal file
8
meta/recipes-core/dropbear/dropbear/dropbearkey.service
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=SSH Key Generation
|
||||||
|
ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=@SBINDIR@/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
|
||||||
|
RemainAfterExit=yes
|
||||||
Reference in New Issue
Block a user