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

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index f82dc80..f5f25ea 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,19 +1,24 @@
-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 -ur libvirt-5.6.0.orig/src/Makefile.in libvirt-5.6.0/src/Makefile.in
+--- libvirt-5.6.0.orig/src/Makefile.in	2019-08-18 18:16:31.092000000 +0200
++++ libvirt-5.6.0/src/Makefile.in	2019-08-18 18:16:45.444000000 +0200
+@@ -6722,7 +6722,7 @@
+ 
  # 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 \
--	  $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
-+	  $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@sysctldir = $(prefix)/lib/sysctl.d
++@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@sysctldir = $(sysconfdir)/sysctl.d
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitdir = $(datadir)/polkit-1
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitactionsdir = $(polkitdir)/actions
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitrulesdir = $(polkitdir)/rules.d
+diff -ur libvirt-5.6.0.orig/src/remote/Makefile.inc.am libvirt-5.6.0/src/remote/Makefile.inc.am
+--- libvirt-5.6.0.orig/src/remote/Makefile.inc.am	2019-08-18 18:16:31.077000000 +0200
++++ libvirt-5.6.0/src/remote/Makefile.inc.am	2019-08-18 18:16:45.445000000 +0200
+@@ -200,7 +200,7 @@
+ 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
+-sysctldir = $(prefix)/lib/sysctl.d
++sysctldir = $(sysconfdir)/sysctl.d
  
- uninstall-sysctl:
--	rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
--	rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
-+	rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
- else ! WITH_SYSCTL
  install-sysctl:
- uninstall-sysctl:
+ 	$(MKDIR_P) $(DESTDIR)$(sysctldir)