X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=a50224fe39329c3b505c750c5cae2a5a9aceb501;hb=ed907d1a766e1396c86568c499a5a1687c0c02f9;hp=3f2acd4987d566f5b795823099269ae42ac4e4fa;hpb=392f6a6608e85bb2105c0ad3d5856c033cc35f6a;p=packages%2Flibvirt.git

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 3f2acd4..a50224f 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,12 +1,31 @@
-diff -urp libvirt-3.0.0.orig/daemon/Makefile.am libvirt-3.0.0/daemon/Makefile.am
---- libvirt-3.0.0.orig/daemon/Makefile.am	2017-02-11 16:03:23.470360384 +0000
-+++ libvirt-3.0.0/daemon/Makefile.am	2017-02-11 16:03:38.597360214 +0000
-@@ -402,13 +402,11 @@ if WITH_SYSCTL
+diff -urp libvirt-4.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in
+--- libvirt-4.2.0.orig/src/Makefile.in	2018-04-12 12:49:25.591575905 +0000
++++ libvirt-4.2.0/src/Makefile.in	2018-04-12 12:54:21.166572577 +0000
+@@ -13057,13 +13057,11 @@ lxc/lxc_controller_dispatch.h: $(srcdir)
+ # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
+ # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@install-sysctl:
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@	$(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@	  $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
++@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@	  $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+ 
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@uninstall-sysctl:
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@	rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@	rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
++@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_FALSE@install-sysctl:
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_FALSE@uninstall-sysctl:
+ 
+diff -urp libvirt-4.2.0.orig/src/remote/Makefile.inc.am libvirt-4.2.0/src/remote/Makefile.inc.am
+--- libvirt-4.2.0.orig/src/remote/Makefile.inc.am	2018-04-12 12:49:25.608575905 +0000
++++ libvirt-4.2.0/src/remote/Makefile.inc.am	2018-04-12 12:52:11.899574033 +0000
+@@ -194,13 +194,11 @@ 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)$(prefix)/lib/sysctl.d
- 	$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
+ 	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \
 -	  $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
 +	  $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf