From: Jan Palus <atler@pld-linux.org>
Date: Thu, 17 Oct 2019 10:58:06 +0000 (+0200)
Subject: fix sshd-keygen location in on demand service; rel 2
X-Git-Tag: auto/th/openssh-8.1p1-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssh.git;a=commitdiff_plain;h=dbfa4526fe0cb100d85a3b5eb993130eb820162a

fix sshd-keygen location in on demand service; rel 2
---

diff --git a/openssh.spec b/openssh.spec
index ae1b8dd..9910979 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -36,7 +36,7 @@ Summary(ru.UTF-8):	OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	8.1p1
-Release:	1
+Release:	2
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
@@ -629,6 +629,7 @@ install -p %{SOURCE10} $RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen
 %{__sed} -i -e 's|@@LIBEXECDIR@@|%{_libexecdir}|g' \
 	$RPM_BUILD_ROOT/etc/rc.d/init.d/sshd \
 	$RPM_BUILD_ROOT%{systemdunitdir}/sshd.service \
+	$RPM_BUILD_ROOT%{systemdunitdir}/sshd@.service \
 	$RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen
 
 %if %{with gnome}
diff --git a/sshd@.service b/sshd@.service
index 7a8db43..92d1ee0 100644
--- a/sshd@.service
+++ b/sshd@.service
@@ -4,6 +4,6 @@ After=syslog.target auditd.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/sshd
-ExecStartPre=/usr/sbin/sshd-keygen
+ExecStartPre=@@LIBEXECDIR@@/sshd-keygen
 ExecStart=-/usr/sbin/sshd -i $OPTIONS
 StandardInput=socket