From: Eric Blake <eblake@redhat.com>
Date: Mon, 5 Nov 2012 16:48:28 +0000 (-0700)
Subject: spec: don't enable cgconfig under systemd
X-Git-Tag: CVE-2012-3411~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b61eadf3c62be4dfa452e04bf851aa5f2e0acb4b;p=thirdparty%2Flibvirt.git

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.
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 10c7083fd0..b6ded04b09 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1468,7 +1468,6 @@ done
 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}