From: Mingli Yu <mingli.yu@windriver.com>
Date: Thu, 26 Oct 2023 07:04:40 +0000 (+0800)
Subject: openssh: Don't hardcode the dir in sshd.service
X-Git-Tag: yocto-5.2~4754
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=977820725c39736061b649389864a53e112e213d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

openssh: Don't hardcode the dir in sshd.service

Don't hardcode the directory of the binary in sshd.service.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.service b/meta/recipes-connectivity/openssh/openssh/sshd.service
index 6ace67d8aec..2a997b656ac 100644
--- a/meta/recipes-connectivity/openssh/openssh/sshd.service
+++ b/meta/recipes-connectivity/openssh/openssh/sshd.service
@@ -6,7 +6,7 @@ After=sshdgenkeys.service
 [Service]
 Environment="SSHD_OPTS="
 EnvironmentFile=-/etc/default/ssh
-ExecStartPre=/usr/bin/mkdir -p /var/run/sshd
+ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd
 ExecStart=-@SBINDIR@/sshd -D $SSHD_OPTS
 ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
 KillMode=process