From 6503cb121780ace31f870e891fe406d303193575 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 11 Jun 2012 17:57:38 +0100 Subject: [PATCH] Two RPM conditional fixes for RHEL-7 Ensure systemd is used in RHEL-7 and cgconfig is not used in RHEL-7 (cherry picked from commit 1cdbe4d22a5aa56126d197cc87d581eda89a42cf) --- libvirt.spec.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 081ab98ab0..d2d142dfdb 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -118,8 +118,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 @@ -975,9 +976,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