[libvirt] [PATCH] spec: fix f28 rpm without firewalld zone

Cole Robinson posted 1 patch 3 weeks ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/928ee40613b7fde3d54df7890949adce35553cc2.1556636871.git.crobinso@redhat.com
libvirt.spec.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

[libvirt] [PATCH] spec: fix f28 rpm without firewalld zone

Posted by Cole Robinson 3 weeks ago
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

Reported-by: Yuval Turgeman <yturgema@redhat.com>
Signed-off-by: Cole Robinson <crobinso@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
 
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] spec: fix f28 rpm without firewalld zone

Posted by Laine Stump 3 weeks ago
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}


>
> Reported-by: Yuval Turgeman <yturgema@redhat.com>
> Signed-off-by: Cole Robinson <crobinso@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@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] spec: fix f28 rpm without firewalld zone

Posted by Laine Stump 3 weeks ago
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@laine.org>


>
>
>>
>> Reported-by: Yuval Turgeman <yturgema@redhat.com>
>> Signed-off-by: Cole Robinson <crobinso@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@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list