mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 11:22:23 +00:00
spec: Automatically turn on cgconfig service
A number of the libvirt APIs require the use of cgroups. This is not enabled by default on a RHEL6 install. After discussion with cgroups team, it was decided that upon installation of the libvirt RPM, we should automatically turn on the cgroups service. This will activate a default configuration that turns on all cgroups controllers libvirt requires for full operation.
This commit is contained in:
parent
0ecac8aa54
commit
318a4f6be9
@ -68,6 +68,7 @@
|
|||||||
%define with_libnl 0%{!?_without_libnl:0}
|
%define with_libnl 0%{!?_without_libnl:0}
|
||||||
%define with_audit 0%{!?_without_audit:0}
|
%define with_audit 0%{!?_without_audit:0}
|
||||||
%define with_dtrace 0%{!?_without_dtrace:0}
|
%define with_dtrace 0%{!?_without_dtrace:0}
|
||||||
|
%define with_cgconfig 0%{!?_without_cgconfig:0}
|
||||||
|
|
||||||
# Non-server/HV driver defaults which are always enabled
|
# Non-server/HV driver defaults which are always enabled
|
||||||
%define with_python 0%{!?_without_python:1}
|
%define with_python 0%{!?_without_python:1}
|
||||||
@ -169,6 +170,13 @@
|
|||||||
%define with_dtrace 1
|
%define with_dtrace 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Pull in cgroups config system
|
||||||
|
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
||||||
|
%if %{with_qemu} || %{with_lxc}
|
||||||
|
%define with_cgconfig 0%{!?_without_cgconfig:1}
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
# Force QEMU to run as non-root
|
# Force QEMU to run as non-root
|
||||||
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
||||||
%define qemu_user qemu
|
%define qemu_user qemu
|
||||||
@ -271,6 +279,9 @@ Requires: parted
|
|||||||
# For multipath support
|
# For multipath support
|
||||||
Requires: device-mapper
|
Requires: device-mapper
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with_cgconfig}
|
||||||
|
Requires: libcgroup
|
||||||
|
%endif
|
||||||
%if %{with_xen}
|
%if %{with_xen}
|
||||||
BuildRequires: xen-devel
|
BuildRequires: xen-devel
|
||||||
%endif
|
%endif
|
||||||
@ -725,6 +736,12 @@ then
|
|||||||
fi
|
fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with_cgconfig}
|
||||||
|
if [ "$1" -eq "1" ]; then
|
||||||
|
/sbin/chkconfig cgconfig on
|
||||||
|
fi
|
||||||
|
%endif
|
||||||
|
|
||||||
/sbin/chkconfig --add libvirtd
|
/sbin/chkconfig --add libvirtd
|
||||||
if [ "$1" -ge "1" ]; then
|
if [ "$1" -ge "1" ]; then
|
||||||
/sbin/service libvirtd condrestart > /dev/null 2>&1
|
/sbin/service libvirtd condrestart > /dev/null 2>&1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user