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

diff --git a/openssh.spec b/openssh.spec
index ae1b8ddc3d39b761be520c5c9b2bdfa2f7e1b2dd..9910979e1e15184288b599da57a4d3835bca2475 100644 (file)
--- 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
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
 Version:       8.1p1

-Release:       1
+Release:       2

 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 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 \
 %{__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}
        $RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen
 
 %if %{with gnome}

diff --git a/sshd@.service b/sshd@.service
index 7a8db4379a515385a4e6cd1813d5b07910696eb7..92d1ee04045d7afb3f108746090980e1b2d93500 100644 (file)
--- a/sshd@.service
+++ b/sshd@.service
@@ -4,6 +4,6 @@ After=syslog.target auditd.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/sshd
 
 [Service]
 EnvironmentFile=/etc/sysconfig/sshd

-ExecStartPre=/usr/sbin/sshd-keygen
+ExecStartPre=@@LIBEXECDIR@@/sshd-keygen

 ExecStart=-/usr/sbin/sshd -i $OPTIONS
 StandardInput=socket
 ExecStart=-/usr/sbin/sshd -i $OPTIONS
 StandardInput=socket