openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

spec: remove libcgroup and cgconfig 

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

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2018-07-18 12:29:35 +02:00
parent 3854e73278
commit e1bc278ecc
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libvirt.spec.in
View File

@ -80,7 +80,6 @@
# A few optional bits off by default, we enable later # A few optional bits off by default, we enable later
%define with_fuse 0%{!?_without_fuse:0} %define with_fuse 0%{!?_without_fuse:0}
%define with_cgconfig 0%{!?_without_cgconfig:0}
%define with_sanlock 0%{!?_without_sanlock:0} %define with_sanlock 0%{!?_without_sanlock:0}
%define with_systemd 0%{!?_without_systemd:0} %define with_systemd 0%{!?_without_systemd:0}
%define with_numad 0%{!?_without_numad:0} %define with_numad 0%{!?_without_numad:0}
@ -216,11 +215,6 @@
%endif %endif
%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 # Force QEMU to run as non-root
%define qemu_user qemu %define qemu_user qemu
%define qemu_group qemu %define qemu_group qemu
@ -496,9 +490,6 @@ Requires: polkit >= 0.112
%else %else
Requires: polkit >= 0.93 Requires: polkit >= 0.93
%endif %endif
%if %{with_cgconfig}
Requires: libcgroup
%endif
%ifarch %{ix86} x86_64 ia64 %ifarch %{ix86} x86_64 ia64
# For virConnectGetSysinfo # For virConnectGetSysinfo
Requires: dmidecode Requires: dmidecode
@ -1490,16 +1481,6 @@ if [ $1 -eq 1 ] ; then
fi fi
%endif %endif
%else %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 libvirtd
/sbin/chkconfig --add virtlogd /sbin/chkconfig --add virtlogd
/sbin/chkconfig --add virtlockd /sbin/chkconfig --add virtlockd