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.
(cherry picked from commit a1fd56cb3057c45cffbf5d41eaf70a26d2116b20)

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 66140909d0ccc045343ecee2e5848943b2f994d8..0c5a9e98efa32cee3993070b663ae653a9765ffb 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -267,14 +267,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:

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 56569c6bdf3d2592af71abd7a9f7fadba50d1c23..2cd105ac54be7f176f7472a9af05c3148804f4c5 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1632,9 +1632,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %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/