From: Norbert Lange <nolange79@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 4/4] package/openssh: add sd socket-activated ssh daemon services
Date: Sat, 6 Jun 2020 00:59:04 +0200 [thread overview]
Message-ID: <20200605225905.14082-4-nolange79@gmail.com> (raw)
In-Reply-To: <20200605225905.14082-1-nolange79@gmail.com>
Signed-off-by: Norbert Lange <nolange79@gmail.com>
---
package/openssh/openssh.mk | 6 +++---
package/openssh/sshd-host-keygen.service | 2 +-
package/openssh/sshd.socket | 11 +++++++++++
package/openssh/sshd at .service | 10 ++++++++++
4 files changed, 25 insertions(+), 4 deletions(-)
create mode 100644 package/openssh/sshd.socket
create mode 100644 package/openssh/sshd at .service
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 6b3ee1f5f4..1f2638e9c9 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -114,9 +114,9 @@ endef
OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SERVER_PROGRAMS
define OPENSSH_INSTALL_INIT_SYSTEMD
- mkdir $(TARGET_DIR)/usr/lib/systemd/system
- $(INSTALL) -m 644 package/openssh/sshd*.service \
- $(TARGET_DIR)/usr/lib/systemd/system/
+ mkdir -p $(TARGET_DIR)/usr/lib/systemd/system
+ $(INSTALL) -m 644 package/openssh/sshd*.service package/openssh/sshd.socket \
+ $(TARGET_DIR)/usr/lib/systemd/system/.
$(OPENSSH_INSTALL_SYSTEMD_SYSUSERS)
endef
diff --git a/package/openssh/sshd-host-keygen.service b/package/openssh/sshd-host-keygen.service
index 058e671c44..ffde622b01 100644
--- a/package/openssh/sshd-host-keygen.service
+++ b/package/openssh/sshd-host-keygen.service
@@ -17,4 +17,4 @@ Type=oneshot
RemainAfterExit=yes
[Install]
-WantedBy=sshd.service
+WantedBy=sshd.service sshd.socket
diff --git a/package/openssh/sshd.socket b/package/openssh/sshd.socket
new file mode 100644
index 0000000000..bbae9ed7aa
--- /dev/null
+++ b/package/openssh/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenBSD Secure Shell server socket
+Before=sshd.service
+Conflicts=sshd.service
+
+[Socket]
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/package/openssh/sshd at .service b/package/openssh/sshd at .service
new file mode 100644
index 0000000000..b3a590d9a3
--- /dev/null
+++ b/package/openssh/sshd at .service
@@ -0,0 +1,10 @@
+[Unit]
+Description=OpenBSD Secure Shell server per-connection daemon
+Documentation=man:sshd(8) man:sshd_config(5)
+After=auditd.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+StandardInput=socket
+RuntimeDirectory=sshd
+RuntimeDirectoryMode=0755
--
2.26.2
next prev parent reply other threads:[~2020-06-05 22:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 22:59 [Buildroot] [PATCH 1/4] package/openssh: Depend on libaudit if available Norbert Lange
2020-06-05 22:59 ` [Buildroot] [PATCH 2/4] package/openssh: improve integration for systemd Norbert Lange
2020-06-06 20:31 ` Thomas Petazzoni
2020-06-07 10:54 ` Jérémy ROSEN
2020-06-07 19:03 ` Norbert Lange
2020-06-07 19:16 ` Jérémy ROSEN
2020-06-07 19:24 ` Norbert Lange
2020-06-07 19:42 ` Jérémy ROSEN
2020-06-11 0:04 ` Norbert Lange
2020-06-11 6:14 ` Jérémy ROSEN
2020-06-05 22:59 ` [Buildroot] [PATCH 3/4] package/openssh: seperate sd service for host key generation Norbert Lange
2020-06-07 10:44 ` Jérémy ROSEN
2020-06-07 18:55 ` Norbert Lange
2020-06-07 19:09 ` Jérémy ROSEN
2020-06-05 22:59 ` Norbert Lange [this message]
2020-06-07 11:06 ` [Buildroot] [PATCH 4/4] package/openssh: add sd socket-activated ssh daemon services Jérémy ROSEN
2020-06-07 19:10 ` Norbert Lange
2020-06-07 19:31 ` Jérémy ROSEN
2020-06-07 19:45 ` Norbert Lange
2020-06-07 21:30 ` Norbert Lange
2020-06-07 21:43 ` Jérémy ROSEN
2020-06-06 20:29 ` [Buildroot] [PATCH 1/4] package/openssh: Depend on libaudit if available Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200605225905.14082-4-nolange79@gmail.com \
--to=nolange79@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox