59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
|
commit a1fd56cb3057c45cffbf5d41eaf70a26d2116b20
|
||
|
|
Author: Eric Blake <eblake@redhat.com>
|
||
|
|
Date: Fri Jan 4 14:21:59 2013 -0700
|
||
|
|
|
||
|
|
build: install libvirt sysctl file correctly
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=887017 reports that
|
||
|
|
even though libvirt attempts to set fs.aio-max-nr via sysctl,
|
||
|
|
the file was installed with the wrong name and gets ignored by
|
||
|
|
sysctl. Furthermore, 'man systcl.d' recommends that packages
|
||
|
|
install into hard-coded /usr/lib/sysctl.d (even when libdir is
|
||
|
|
/usr/lib64), so that sysadmins can use /etc/sysctl.d for overrides.
|
||
|
|
|
||
|
|
* daemon/Makefile.am (install-sysctl, uninstall-sysctl): Use
|
||
|
|
correct location.
|
||
|
|
* libvirt.spec.in (network_files): Reflect this.
|
||
|
|
|
||
|
|
Index: libvirt-1.0.1/daemon/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-1.0.1.orig/daemon/Makefile.am
|
||
|
|
+++ libvirt-1.0.1/daemon/Makefile.am
|
||
|
|
@@ -273,14 +273,16 @@ uninstall-sysconfig:
|
||
|
|
rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||
|
|
|
||
|
|
if WITH_SYSCTL
|
||
|
|
+# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
|
||
|
|
+# /usr/lib/sysctl.d/ even when libdir is /usr/lib64
|
||
|
|
install-sysctl:
|
||
|
|
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d
|
||
|
|
+ $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
|
||
|
|
$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
|
||
|
|
- $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
|
||
|
|
+ $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf
|
||
|
|
|
||
|
|
uninstall-sysctl:
|
||
|
|
- rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
|
||
|
|
- rmdir $(DESTDIR)$(sysconfdir)/sysctl.d || :
|
||
|
|
+ rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf
|
||
|
|
+ rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
|
||
|
|
else
|
||
|
|
install-sysctl:
|
||
|
|
uninstall-sysctl:
|
||
|
|
Index: libvirt-1.0.1/libvirt.spec.in
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-1.0.1.orig/libvirt.spec.in
|
||
|
|
+++ libvirt-1.0.1/libvirt.spec.in
|
||
|
|
@@ -1678,9 +1678,9 @@ fi
|
||
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
|
||
|
|
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
|
||
|
|
%if 0%{?fedora} >= 14 || 0%{?rhel} >= 6
|
||
|
|
-%config(noreplace) %{_sysconfdir}/sysctl.d/libvirtd
|
||
|
|
+%config(noreplace) %{_prefix}/lib/sysctl.d/libvirtd.conf
|
||
|
|
%else
|
||
|
|
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
|
||
|
|
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/libvirtd.conf
|
||
|
|
%endif
|
||
|
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
||
|
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
|