starlingx
/
integ
Code Issues Proposed changes

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 <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2019-08-16 23:27:37 +08:00 committed by zhipeng liu
parent fe018fd3c8
commit 877f2b0c33
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base/openssh-config/centos/openssh-config.spec
View File

@ -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