X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=d6afa50a0be2d6aaf7843349e0b2b47efab12afd;hb=e6a341e2d7c7a36e72eeda5062672ea146435957;hp=a6bb480e497b4fae17ba6345028ca4487277bf83;hpb=220284abd9e3eba309f18d911bc9f86d1293d677;p=packages%2Flibvirt.git

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index a6bb480..d6afa50 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,19 +1,24 @@
-diff -urp libvirt-2.3.0.orig/daemon/Makefile.am libvirt-2.3.0/daemon/Makefile.am
---- libvirt-2.3.0.orig/daemon/Makefile.am	2016-10-28 19:20:01.192715000 +0000
-+++ libvirt-2.3.0/daemon/Makefile.am	2016-10-28 19:20:22.734715000 +0000
-@@ -401,13 +401,11 @@ if WITH_SYSCTL
+diff -ur libvirt-5.5.0.orig/src/Makefile.in libvirt-5.5.0/src/Makefile.in
+--- libvirt-5.5.0.orig/src/Makefile.in	2019-07-14 19:28:49.824000000 +0200
++++ libvirt-5.5.0/src/Makefile.in	2019-07-14 19:29:06.685000000 +0200
+@@ -6716,7 +6716,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.5.0.orig/src/remote/Makefile.inc.am libvirt-5.5.0/src/remote/Makefile.inc.am
+--- libvirt-5.5.0.orig/src/remote/Makefile.inc.am	2019-07-14 19:28:49.809000000 +0200
++++ libvirt-5.5.0/src/remote/Makefile.inc.am	2019-07-14 19:29:06.685000000 +0200
+@@ -195,7 +195,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)