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

Two RPM conditional fixes for RHEL-7 

Ensure systemd is used in RHEL-7 and cgconfig is not used in
RHEL-7
This commit is contained in:
Daniel P. Berrange 2012-06-11 17:57:38 +01:00
parent 2e13b9ab3c
commit 1cdbe4d22a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libvirt.spec.in
View File

@ -133,8 +133,9 @@
%define with_hyperv 0
%endif
# Although earlier Fedora has systemd, libvirt still used sysvinit
%if 0%{?fedora} >= 17
# Fedora 17 / RHEL-7 are first where we use systemd. Although earlier
# Fedora has systemd, libvirt still used sysvinit there.
%if 0%{?fedora} >= 17 || 0{?rhel} >= 7
%define with_systemd 1
%endif
@ -1348,9 +1349,9 @@ if [ $1 -eq 1 ] ; then
fi
%else
%if %{with_cgconfig}
# Starting with Fedora 16, systemd automounts all cgroups, and cgconfig is
# no longer a necessary service.
%if 0%{?rhel} || (0%{?fedora} && 0%{?fedora} < 16)
# 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)
if [ "$1" -eq "1" ]; then
/sbin/chkconfig cgconfig on
fi