Re: [libvirt] [PATCH] spec: fix f28 rpm without firewalld zone
On 4/30/19 11:20 AM, Laine Stump wrote:
On 4/30/19 11:08 AM, Cole Robinson wrote:
> Commit 3b71f2e42d added spec handling for with_firewalld_zone. We
> now call %firewalld_reload if with_firewalld is set. But the matching
> 'BuildRequires: firewalld-filesystem' is only applied if
> with_firewalld_zone is set.
>
> Fix the former bit to use with_firewalld_zone
Actually, I think what we want is for the BuildRequires to be %if
%{with_firewalld}
I spoke too soon. Once I went back to reread my own commit message, I
saw that the only reason for reloading firewalld was to load/reload the
libvirt zonefile. If the zonefile isn't there, then no need to reload it.
So:
Reviewed-by: Laine Stump <laine(a)laine.org>
>
> Reported-by: Yuval Turgeman <yturgema(a)redhat.com>
> Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
> ---
> libvirt.spec.in | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 18f0a0e217..876b2f0897 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -1387,12 +1387,12 @@ fi
> rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
> %post daemon-driver-network
> -%if %{with_firewalld}
> +%if %{with_firewalld_zone}
> %firewalld_reload
> %endif
> %postun daemon-driver-network
> -%if %{with_firewalld}
> +%if %{with_firewalld_zone}
> %firewalld_reload
> %endif
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list