X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=2b890d75c501720ae44cd37c2212f6a00e388d52;hb=71a5e15c242981328418b3378f76793bf4661c39;hp=60d80cfd6821d8e34a04e37a10c311a0527fc1fa;hpb=f08e2de848020f421ff12e52ee56c58506abe1f6;p=packages%2Flibvirt.git

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 60d80cf..2b890d7 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,19 +1,24 @@
-diff -urp libvirt-4.0.0.orig/daemon/Makefile.am libvirt-4.0.0/daemon/Makefile.am
---- libvirt-4.0.0.orig/daemon/Makefile.am	2018-01-24 12:20:41.759455691 +0000
-+++ libvirt-4.0.0/daemon/Makefile.am	2018-01-24 12:21:41.897452106 +0000
-@@ -347,13 +347,11 @@ if WITH_SYSCTL
+diff -ur libvirt-5.10.0.orig/src/Makefile.in libvirt-5.10.0/src/Makefile.in
+--- libvirt-5.10.0.orig/src/Makefile.in	2019-12-08 00:46:48.402000000 +0100
++++ libvirt-5.10.0/src/Makefile.in	2019-12-08 00:46:58.276000000 +0100
+@@ -7402,7 +7402,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.10.0.orig/src/remote/Makefile.inc.am libvirt-5.10.0/src/remote/Makefile.inc.am
+--- libvirt-5.10.0.orig/src/remote/Makefile.inc.am	2019-12-08 00:46:48.414000000 +0100
++++ libvirt-5.10.0/src/remote/Makefile.inc.am	2019-12-08 00:46:58.277000000 +0100
+@@ -327,7 +327,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)