X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=4834b1441bef78794d86f12b53de5f6f2984581a;hb=b6348913329f24b2ffa0afd0bd02c528d62ee3dc;hp=f82dc80b4e8cf9e7764b034a5c3c2b94565d2127;hpb=5362742718a035681452094c18259125ad56676e;p=packages%2Flibvirt.git

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index f82dc80..4834b14 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,12 +1,31 @@
-diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am
---- libvirt-2.1.0.orig/daemon/Makefile.am	2016-08-20 10:29:38.054554000 +0000
-+++ libvirt-2.1.0/daemon/Makefile.am	2016-08-20 10:31:14.932554000 +0000
-@@ -401,13 +401,11 @@ if WITH_SYSCTL
+diff -urp libvirt-4.5.0.orig/src/Makefile.in libvirt-4.5.0/src/Makefile.in
+--- libvirt-4.5.0.orig/src/Makefile.in	2018-07-09 16:30:47.099854268 +0000
++++ libvirt-4.5.0/src/Makefile.in	2018-07-09 16:31:05.422853176 +0000
+@@ -13125,13 +13125,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.5.0.orig/src/remote/Makefile.inc.am libvirt-4.5.0/src/remote/Makefile.inc.am
+--- libvirt-4.5.0.orig/src/remote/Makefile.inc.am	2018-07-09 16:30:47.115854267 +0000
++++ libvirt-4.5.0/src/remote/Makefile.inc.am	2018-07-09 16:31:05.423853176 +0000
+@@ -199,13 +199,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