[libvirt] Patch replaces scriptlets with new systemd macros

[Eric Blake]

On 10/25/2012 04:10 AM, Václav Pavlín wrote:
> Hi,
> 
> sorry, I didn't realize I have to modify upstream version.

No problem - we'll get it all straightened out.

> 
> I added Requires stanza to libvirtd service file for cgconfig.service,
> so you should not need to call enable in spec file for it.

We independently decided to drop that hunk as worthless (If F16 didn't
need it, then why does F17?)

> 
> I added %with_systemd_macros so it should now work in F17 with old
> scriptlets and in F18+/RHEL7+ with systemd macros

That's the piece I was missing in the original submission.  Looks like
we're ready to take things now.

> +++ b/daemon/libvirtd.service.in
> @@ -7,6 +7,7 @@
>  Description=Virtualization daemon
>  Before=libvirt-guests.service
>  After=network.target
> +Requires=cgconfig.service
>

This hunk is no longer needed.

> +++ b/libvirt.spec.in
> @@ -319,6 +319,13 @@
>  %define with_rhel5  0
>  %endif
>
> +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
> +%define with_systemd_macros 1
> +%else
> +%define with_systemd_macros 0
> +%endif

Looks reasonable.

>  %if %{with_systemd}
> -if [ $1 -eq 1 ] ; then
> -    # Initial installation
> -    /bin/systemctl enable libvirtd.service >/dev/null 2>&1 || :
> -    /bin/systemctl enable cgconfig.service >/dev/null 2>&1 || :
> -fi
> +%if %{with_systemd_macros}
> +    %systemd_post libvirtd.service
> +%else
> +    if [ $1 -eq 1 ] ; then
> +        # Initial installation
> +        /bin/systemctl enable libvirtd.service >/dev/null 2>&1 || :
> +    fi
> +%endif

I don't know if the extra indentation makes things more or less legible;
it made the diff bigger, though, so I removed it.

ACK and pushed.  This will be present in libvirt 1.0.1 for rawhide, and
will probably be picked up for libvirt 0.10.2.2 for F18.

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 617 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20121105/3bf9f611/attachment-0001.sig>