Two RPM conditional fixes for RHEL-7

Ensure systemd is used in RHEL-7 and cgconfig is not used in RHEL-7

Two RPM conditional fixes for RHEL-7
Ensure systemd is used in RHEL-7 and cgconfig is not used in RHEL-7
1cdbe4d2 · Daniel P. Berrange · 2e13b9ab · 1cdbe4d2
隐藏空白更改
内联并排

Showing with 6 addition and 5 deletion

libvirt.spec.in libvirt.spec.in +6 -5

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