[gentoo-commits] repo/gentoo:master commit in: app-metrics/fusioninventory-agent/files/, app-metrics/fusioninventory-agent/

[gentoo-commits] repo/gentoo:master commit in: app-metrics/fusioninventory-agent/files/, app-metrics/fusioninventory-agent/

[Alexey Shvetsov]

commit:     1bf4ec1b842b9d6c96834ffe54ec35eb6b779124
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 07:15:59 2020 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed May 27 07:16:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf4ec1b

app-metrics/fusioninventory-agent: Fix config path

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

 .../files/fusioninventory-agent-2.5.2-dirs.patch             | 12 ++++++++++++
 .../fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch b/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch
index d4c0f4eadb0..e37b58c43a0 100644
--- a/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch
+++ b/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch
@@ -21,3 +21,15 @@
      );
  
      # allow variables defined on command line to override defaults
+--- a/lib/FusionInventory/Agent/Config.pm     2020-05-27 10:06:21.248964808 +0300
++++ b/lib/FusionInventory/Agent/Config.pm     2020-05-27 10:06:57.324964823 +0300
+@@ -67,7 +67,7 @@
+     my ($class, %params) = @_;
+ 
+     my $self = {
+-        '_confdir' => undef, # SYSCONFDIR replaced here from Makefile
++        '_confdir' => '/etc/fusioninventory', # SYSCONFDIR replaced here from Makefile
+     };
+     bless $self, $class;
+     $self->_loadDefaults();
+

diff --git a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
index 3350194f9c0..9b0a5d9d145 100644
--- a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
+++ b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
@@ -36,7 +36,7 @@ PATCHES=( "${FILESDIR}/${P}-dirs.patch" )
 src_install() {
 	default
 	systemd_dounit contrib/unix/fusioninventory-agent.service
-	doinitd "${FILESDIR}/${PN}.initd"
-	doconfd "${FILESDIR}/${PN}.confd"
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 	keepdir /var/lib/fusioninventory
 }