shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

spec: fix logic bug in deciding to turn on cgconfig

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=738725

Commit ecd8725 tried to silence a spurious warning on the initial
libvirt install, and commit ba6cbb1 tried to fix up the logic to the
correct Fedora version, but the warning was still present due to a
logic bug: since %{fedora} and %{rhel} are never simulatanously
set, then 0%{rhel} <= 6 made the %if always true.  Checking for
minimum versions (via >=) is okay, but checking for maximum versions
(via <=) requires a prerequisite test that the platform being tested
is non-zero.

Also fix a bogus setting of with_libxl (although we previously
hard-code with_libxl to 0 for rhel earlier in the file, so this
was not as severe a bug).

* libvirt.spec.in (with_cgconfig): Don't enable cgconfig on F16.
This commit is contained in:
Eric Blake 2011-12-08 13:32:37 -07:00
parent 9c417636c4
commit 3b95f284f1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvirt.spec.in
View File

@ -147,7 +147,7 @@
%endif %endif
# Fedora doesn't have new enough Xen for libxl until F16 # Fedora doesn't have new enough Xen for libxl until F16
%if 0%{?fedora} < 16 %if 0%{?fedora} && 0%{?fedora} < 16
%define with_libxl 0 %define with_libxl 0
%endif %endif
@ -948,7 +948,7 @@ fi
%if %{with_cgconfig} %if %{with_cgconfig}
# Starting with Fedora 16, systemd automounts all cgroups, and cgconfig is # Starting with Fedora 16, systemd automounts all cgroups, and cgconfig is
# no longer a necessary service. # no longer a necessary service.
%if 0%{?fedora} <= 15 || 0%{?rhel} <= 6 %if 0%{?rhel} || (0%{?fedora} && 0%{?fedora} < 16)
if [ "$1" -eq "1" ]; then if [ "$1" -eq "1" ]; then
/sbin/chkconfig cgconfig on /sbin/chkconfig cgconfig on
fi fi