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

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 3f2acd4..e6b16f8 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,19 +1,24 @@
-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 -ur libvirt-6.1.0.orig/src/Makefile.in libvirt-6.1.0/src/Makefile.in
+--- libvirt-6.1.0.orig/src/Makefile.in	2020-03-06 09:52:13.294000000 +0100
++++ libvirt-6.1.0/src/Makefile.in	2020-03-06 09:52:22.081000000 +0100
+@@ -6266,7 +6266,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-6.1.0.orig/src/remote/Makefile.inc.am libvirt-6.1.0/src/remote/Makefile.inc.am
+--- libvirt-6.1.0.orig/src/remote/Makefile.inc.am	2020-03-06 09:52:13.305000000 +0100
++++ libvirt-6.1.0/src/remote/Makefile.inc.am	2020-03-06 09:52:22.081000000 +0100
+@@ -334,7 +334,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)