mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 17:19:23 +00:00
openssh: Remove systemd support which is merged in oe-core
OE-Core has been updated to support openssh with systemd. Stuff here is not required anymore. Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
19a61e1f0c
commit
c837f8a883
@@ -1,11 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Conflicts=sshd.service
|
|
||||||
|
|
||||||
[Socket]
|
|
||||||
ExecStartPre=/bin/mkdir -p /var/run/sshd
|
|
||||||
ListenStream=22
|
|
||||||
Accept=yes
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=sockets.target
|
|
||||||
Also=sshdgenkeys.service
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=OpenSSH Per-Connection Daemon
|
|
||||||
After=sshdgenkeys.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=-/usr/sbin/sshd -i
|
|
||||||
ExecReload=/bin/kill -HUP $MAINPID
|
|
||||||
StandardInput=socket
|
|
||||||
StandardError=syslog
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=SSH Key Generation
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/usr/bin/ssh-keygen -A
|
|
||||||
Type=oneshot
|
|
||||||
RemainAfterExit=yes
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
@@ -1,19 +1,3 @@
|
|||||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
|
||||||
|
|
||||||
SYSTEMD_PACKAGES = "${PN}-sshd"
|
|
||||||
SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
|
|
||||||
FILES_${PN}-sshd += "${systemd_unitdir}/system/sshd.socket"
|
|
||||||
RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd"
|
RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd"
|
||||||
RREPLACES_${PN}-sshd += "${PN}-sshd-systemd"
|
RREPLACES_${PN}-sshd += "${PN}-sshd-systemd"
|
||||||
RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd"
|
RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd"
|
||||||
|
|
||||||
inherit systemd
|
|
||||||
|
|
||||||
SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service"
|
|
||||||
do_install_append() {
|
|
||||||
install -d ${D}${systemd_unitdir}/system
|
|
||||||
install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
|
|
||||||
install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system
|
|
||||||
install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user