From 1bf4ec1b842b9d6c96834ffe54ec35eb6b779124 Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Wed, 27 May 2020 10:15:59 +0300 Subject: [PATCH] app-metrics/fusioninventory-agent: Fix config path Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Alexey Shvetsov --- .../files/fusioninventory-agent-2.5.2-dirs.patch | 12 ++++++++++++ .../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 d4c0f4eadb0f..e37b58c43a0c 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 3350194f9c03..9b0a5d9d145c 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 } -- 2.26.2