[libvirt] Patch replaces scriptlets with new systemd macros

[Eric Blake]

On 10/30/2012 05:56 AM, Daniel P. Berrange wrote:
>> Then why are we explicitly starting cgconfig.service in the spec file?
>> Shouldn't the argument go that only those people customizing the service
>> file to use cgconfig need cgconfig enabled in the first place?  In other
>> words, is there anything wrong with this one-liner?
> 
> Oh that's probably a mistake then. We shouldn't be enabling it for
> systemd based installations.
> 
>>
>> diff --git i/libvirt.spec.in w/libvirt.spec.in
>> index ebebfab..9d11328 100644
>> --- i/libvirt.spec.in
>> +++ w/libvirt.spec.in
>> @@ -1465,13 +1465,12 @@ done
>>  %endif
>>
>>  %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
>>  %else
>>  %if %{with_cgconfig}
>>  # Starting with Fedora 16/RHEL-7, systemd automounts all cgroups,
>>  # and cgconfig is no longer a necessary service.
>>  %if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 16)
> 
> ACK

Thanks; I've (finally) pushed this to master, v0.10.2-maint (F18), and
v0.9.11-main (F17) (too bad I forgot about this thread, and didn't get
it applied before 1.0.0), under the following commit message.

    spec: don't enable cgconfig under systemd

    In Fedora 16, we quit enabling cgconfig because systemd set up
    default cgroups that were good enough for our use.  But in F17,
    when we switched to systemd, we reverted and started up cgconfig
    again.  See also the tail of this thread:
    https://www.redhat.com/archives/libvir-list/2012-October/msg01657.html

    * libvirt.spec.in (with_systemd): Rely on systemd for cgroups.

I will now focus on reviewing the rest of Václav's patch.

-- 
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/5e427047/attachment-0001.sig>