From 3ca4151b87c04e043d4c6746a10f41879af89eb1 Mon Sep 17 00:00:00 2001 From: Leonardo Fagundes Luz Serrano Date: Tue, 23 Aug 2022 23:30:58 -0300 Subject: [PATCH] Duplicate pmon.d conf files to another location Created a duplicate install of /etc/pmon.d/*.conf files to /usr/share/starlingx/pmon.d/ This is part of an effort to allow pmon conf files to be selected at runtime by kickstarts. Test Plan: PASS: duplicate conf on deb Story: 2010211 Task: 46116 Signed-off-by: Leonardo Fagundes Luz Serrano Change-Id: I3274d95c7b657447c79c2512cfcc2d7ba9898b4f --- utilities/logmgmt/debian/deb_folder/logmgmt.dirs | 1 + utilities/logmgmt/debian/deb_folder/logmgmt.install | 1 + utilities/logmgmt/debian/deb_folder/rules | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/utilities/logmgmt/debian/deb_folder/logmgmt.dirs b/utilities/logmgmt/debian/deb_folder/logmgmt.dirs index da921e7f..785eb97a 100644 --- a/utilities/logmgmt/debian/deb_folder/logmgmt.dirs +++ b/utilities/logmgmt/debian/deb_folder/logmgmt.dirs @@ -1,2 +1,3 @@ etc/pmon.d usr/lib/python3/dist-packages/logmgmt* +usr/share/starlingx/pmon.d diff --git a/utilities/logmgmt/debian/deb_folder/logmgmt.install b/utilities/logmgmt/debian/deb_folder/logmgmt.install index 5902ce66..d2c67026 100644 --- a/utilities/logmgmt/debian/deb_folder/logmgmt.install +++ b/utilities/logmgmt/debian/deb_folder/logmgmt.install @@ -3,3 +3,4 @@ etc/init.d/* etc/pmon.d/* usr/lib/systemd/system/logmgmt.service usr/lib/python3/dist-packages/logmgmt* +usr/share/starlingx/pmon.d/* diff --git a/utilities/logmgmt/debian/deb_folder/rules b/utilities/logmgmt/debian/deb_folder/rules index 7d6ecede..0c8753a2 100755 --- a/utilities/logmgmt/debian/deb_folder/rules +++ b/utilities/logmgmt/debian/deb_folder/rules @@ -6,6 +6,7 @@ export ROOT = $(CURDIR)/debian/tmp export LOCAL_BINDIR = $(ROOT)/usr/bin export LOCAL_ETC_INITD = $(ROOT)/etc/init.d export LOCAL_ETC_PMOND = $(ROOT)/etc/pmon.d +export PMONDIR = $(ROOT)/usr/share/starlingx/pmon.d export UNIT_DIR = $(ROOT)/usr/lib/systemd/system %: @@ -29,6 +30,9 @@ override_dh_install: install -d -m 755 $(LOCAL_ETC_PMOND) install -p -D -m 644 scripts/pmon.d/logmgmt $(LOCAL_ETC_PMOND)/logmgmt + install -d -m 755 $(PMONDIR) + install -p -D -m 644 scripts/pmon.d/logmgmt $(PMONDIR)/logmgmt + install -p -D -m 644 scripts/etc/systemd/system/logmgmt.service $(UNIT_DIR)/logmgmt.service dh_install