From 0682f8b2d1eeba7258b0373265bf81a490078cb1 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Tue, 11 Aug 2020 17:38:28 +0300 Subject: [PATCH] rpm-spec: Don't fail on missing /etc/ssh/ssh_config openssh-clients is not a strict requirement of freeipa-client package and if it's missing then this case should be handled in post scriptlet of freeipa-client package. Otherwise, the remaining part of that scriptlet will not be run at all. Fixes: https://pagure.io/freeipa/issue/8459 Signed-off-by: Stanislav Levin --- freeipa.spec.in | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index b047cdf5ef..c6473da8c2 100755 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -1078,14 +1078,11 @@ if [ $1 -gt 1 ] ; then fi %{__python3} -c 'from ipaclient.install.client import configure_krb5_snippet; configure_krb5_snippet()' >>/var/log/ipaupgrade.log 2>&1 - fi - - if [ $restore -ge 2 ]; then %{__python3} -c 'from ipaclient.install.client import update_ipa_nssdb; update_ipa_nssdb()' >>/var/log/ipaupgrade.log 2>&1 - fi - - if [ $restore -ge 2 ]; then - sed -E --in-place=.orig 's/^(HostKeyAlgorithms ssh-rsa,ssh-dss)$/# disabled by ipa-client update\n# \1/' /etc/ssh/ssh_config + SSH_CLIENT_SYSTEM_CONF="/etc/ssh/ssh_config" + if [ -f "$SSH_CLIENT_SYSTEM_CONF" ]; then + sed -E --in-place=.orig 's/^(HostKeyAlgorithms ssh-rsa,ssh-dss)$/# disabled by ipa-client update\n# \1/' "$SSH_CLIENT_SYSTEM_CONF" + fi fi fi