Skip to contentSkip to conversation

openssh: add systemd unit file

PATCH Superseded Gustavo Zacarias 2 participants 3 messages Nov 20, 2013 – Dec 4, 2013

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 openssh: add systemd unit file

And only install sysV-style script when appropiate.

---
 package/openssh/openssh.mk   | 13 ++++++++++---
 package/openssh/sshd.service | 11 +++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 package/openssh/sshd.service
package/openssh/openssh.mk +10 -3
index 8ab2b47..faf2368 100644
@@ -17,10 +17,17 @@ OPENSSH_DEPENDENCIES += linux-pam
 OPENSSH_CONF_OPT += --with-pam
 endif
 
-define OPENSSH_INSTALL_INITSCRIPT
-	$(INSTALL) -D -m 755 package/openssh/S50sshd $(TARGET_DIR)/etc/init.d/S50sshd
+define OPENSSH_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 755 package/openssh/sshd.service \
+		$(TARGET_DIR)/etc/systemd/system/sshd.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -fs ../sshd.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshd.service
 endef
 
-OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_INITSCRIPT
+define OPENSSH_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/openssh/S50sshd \
+		$(TARGET_DIR)/etc/init.d/S50sshd
+endef
 
 $(eval $(autotools-package))
package/openssh/sshd.service new file +11 -0
new file mode 100644
index 0000000..b5e96b3
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenSSH server daemon
+After=syslog.target network.target auditd.service
+
+[Service]
+ExecStartPre=/usr/bin/ssh-keygen -A
+ExecStart=/usr/sbin/sshd -D -e
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH v4 1/1 openssh: add systemd unit file

Hi Gustavo,

2013/11/20 Gustavo Zacarias <[email protected]>

Quoted 21 lines

And only install sysV-style script when appropiate.

---
 package/openssh/openssh.mk   | 13 ++++++++++---
 package/openssh/sshd.service | 11 +++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 package/openssh/sshd.service
package/openssh/openssh.mk +0 -2
index 8ab2b47..faf2368 100644
@@ -17,10 +17,17 @@ OPENSSH_DEPENDENCIES += linux-pam
 OPENSSH_CONF_OPT += --with-pam
 endif
 
-define OPENSSH_INSTALL_INITSCRIPT
-       $(INSTALL) -D -m 755 package/openssh/S50sshd

$(TARGET_DIR)/etc/init.d/S50sshd

package/openssh/openssh.mk OPENSSH_DEPENDENCIES += linux-pam · line 21

Quoted 2 lines
package/openssh/openssh.mk +2 -0
+define OPENSSH_INSTALL_INIT_SYSTEMD
+       $(INSTALL) -D -m 755 package/openssh/sshd.service \

Any specific reason to make sshd.service executable?

Quoted 34 lines
package/openssh/openssh.mk +4 -0
+               $(TARGET_DIR)/etc/systemd/system/sshd.service
+       mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+       ln -fs ../sshd.service \
+

$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshd.service
endef

package/openssh/openssh.mk +4 -1
-OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_INITSCRIPT
+define OPENSSH_INSTALL_INIT_SYSV
+       $(INSTALL) -D -m 755 package/openssh/S50sshd \
+               $(TARGET_DIR)/etc/init.d/S50sshd
+endef
 
 $(eval $(autotools-package))
package/openssh/sshd.service new file +11 -1
new file mode 100644
index 0000000..b5e96b3
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenSSH server daemon
+After=syslog.target network.target auditd.service
+
+[Service]
+ExecStartPre=/usr/bin/ssh-keygen -A
+ExecStart=/usr/sbin/sshd -D -e
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
--

1.8.3.2

Quoted 5 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Otherwise, it looks good to me.

Regards,

Signature · 4 lines
Samuel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131204/8974e81a/attachment.html>
#2 lore raw

PATCH v4 1/1 openssh: add systemd unit file

Quoted 1 line · Samuel Martin

Any specific reason to make sshd.service executable?

Inertia from looking at what the lightttpd package does (755 also). But yes, that's wrong, i'll fix both.
Regards.