daemon: Prefix sysctl configuration filename with a number

Apparently, files in /usr/lib/sysctl.d are usually prefixed with numbers
for easier ordering. Let's be consistent with this. I chose 60 for
libvirtd so that it goes after 50-default.conf.

https://bugzilla.redhat.com/show_bug.cgi?id=1084876
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index b95a79da7bbfde92b03f94ec06c9eb99cba442d4..bceaeb272c88d632439efa7dc8d6a08f91a5d03e 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -341,10 +341,10 @@ if WITH_SYSCTL
 install-sysctl:
        $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
        $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
-         $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf
+         $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
 
 uninstall-sysctl:
-       rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf
+       rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
        rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
 else ! WITH_SYSCTL
 install-sysctl:

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 4c11ab7bd42498f432a67d38660d00a0990fb70d..e08c9e7aebebc442d4d5a3dbf5812814d081e486 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1609,7 +1609,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
 %endif
 
 %if 0%{?rhel} == 5
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/libvirtd.conf
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/60-libvirtd.conf
 %endif
 
 %clean
@@ -1897,7 +1897,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
 %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
     %if 0%{?fedora} || 0%{?rhel} >= 6
-%config(noreplace) %{_prefix}/lib/sysctl.d/libvirtd.conf
+%config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
     %endif
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd