RHEL-6/CentOS-6 is no longer supported, let's remove dependency on
libcgroup and code that enables/starts cgconfig service.
Resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=1602407
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
libvirt.spec.in | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 6f0d399064..6f360c5579 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -80,7 +80,6 @@
# A few optional bits off by default, we enable later
%define with_fuse 0%{!?_without_fuse:0}
-%define with_cgconfig 0%{!?_without_cgconfig:0}
%define with_sanlock 0%{!?_without_sanlock:0}
%define with_systemd 0%{!?_without_systemd:0}
%define with_numad 0%{!?_without_numad:0}
@@ -216,11 +215,6 @@
%endif
%endif
-# Pull in cgroups config system
-%if %{with_qemu} || %{with_lxc}
- %define with_cgconfig 0%{!?_without_cgconfig:1}
-%endif
-
# Force QEMU to run as non-root
%define qemu_user qemu
%define qemu_group qemu
@@ -496,9 +490,6 @@ Requires: polkit >= 0.112
%else
Requires: polkit >= 0.93
%endif
-%if %{with_cgconfig}
-Requires: libcgroup
-%endif
%ifarch %{ix86} x86_64 ia64
# For virConnectGetSysinfo
Requires: dmidecode
@@ -1490,16 +1481,6 @@ if [ $1 -eq 1 ] ; then
fi
%endif
%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
-if [ "$1" -eq "1" ]; then
-/sbin/chkconfig cgconfig on
-fi
- %endif
- %endif
-
/sbin/chkconfig --add libvirtd
/sbin/chkconfig --add virtlogd
/sbin/chkconfig --add virtlockd
--
2.17.1