From 877f2b0c33b4e0547d8eed6f8bc610492f6a2d51 Mon Sep 17 00:00:00 2001 From: zhipengl Date: Fri, 16 Aug 2019 23:27:37 +0800 Subject: [PATCH] Fix user does not login within configured time(60s) login is aborted Root cause is openssh-config need depend on openssh-clients and openssh-server RPM instead of openssh, so that when install openssh-config, it can overwrite ssh_config/sshd_config that installed by openssh-clients and openssh-server. Below test pass After deployment, the expected "LoginGraceTime 1m" can be seen in /etc/ssh/sshd_config, instead of default one. Closes-bug: 1833469 Change-Id: Id59b728dfce39848f34279a5a2d75df417e9e100 Signed-off-by: zhipengl --- base/openssh-config/centos/openssh-config.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/base/openssh-config/centos/openssh-config.spec b/base/openssh-config/centos/openssh-config.spec index 2a92c2b75..f408f9f29 100644 --- a/base/openssh-config/centos/openssh-config.spec +++ b/base/openssh-config/centos/openssh-config.spec @@ -15,7 +15,9 @@ BuildArch: noarch Source: %name-%version.tar.gz Requires: %{_bindir}/systemctl -Requires: openssh +Requires: openssh-clients +Requires: openssh-server + Summary: package StarlingX configuration files of openssh to system folder. %description @@ -34,7 +36,6 @@ package StarlingX configuration files of openssh to system folder. %{__install} -m 600 sshd_config %{buildroot}%{_datadir}/starlingx/sshd_config %post -%define _pamconfdir %{_sysconfdir}/pam.d if [ $1 -eq 1 ] ; then # Initial installation cp -f %{_datadir}/starlingx/ssh_config %{_sysconfdir}/ssh/ssh_config