From 3280ad31be78659430649e6fffd778721619090e Mon Sep 17 00:00:00 2001 From: Leonardo Fagundes Luz Serrano Date: Tue, 23 Aug 2022 23:27:45 -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: 46113 Signed-off-by: Leonardo Fagundes Luz Serrano Change-Id: Ieba1d09e28515b9dea534514b986fa8624bc8c25 --- mtce-guest/debian/deb_folder/mtce-guest-server.install | 5 +++-- mtce-guest/debian/deb_folder/rules | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mtce-guest/debian/deb_folder/mtce-guest-server.install b/mtce-guest/debian/deb_folder/mtce-guest-server.install index e067432a..6c0b4780 100644 --- a/mtce-guest/debian/deb_folder/mtce-guest-server.install +++ b/mtce-guest/debian/deb_folder/mtce-guest-server.install @@ -1,6 +1,7 @@ -usr/local/bin/guestServer etc/init.d/guestServer etc/logrotate.d/guestServer.logrotate etc/mtc/guestServer.ini -etc/pmon.d/guestServer.conf etc/mtc/tmp +etc/pmon.d/guestServer.conf +usr/local/bin/guestServer +usr/share/starlingx/pmon.d/guestServer.conf diff --git a/mtce-guest/debian/deb_folder/rules b/mtce-guest/debian/deb_folder/rules index 3e377e27..d5682f9b 100644 --- a/mtce-guest/debian/deb_folder/rules +++ b/mtce-guest/debian/deb_folder/rules @@ -7,7 +7,8 @@ export BINDIR=/usr/local/bin export INITDIR=$(ROOT)/etc/init.d export LOGDIR=$(ROOT)/etc/logrotate.d export MTCDIR=$(ROOT)/etc/mtc -export PMONDIR=$(ROOT)/etc/pmon.d +export PMONDIR_1=${ROOT}/usr/share/starlingx/pmon.d +export PMONDIR_2=$(ROOT)/etc/pmon.d export SYSCONFDIR=/etc export UNITDIR=/lib/systemd/system @@ -20,6 +21,7 @@ override_dh_auto_install: SYSCONFIGDIR=$(ROOT)/$(SYSCONFDIR) \ LOCALBINDIR=$(ROOT)/$(BINDIR) \ UNITDIR=$(ROOT)/$(UNITDIR) install + install -d -m 755 $(INITDIR) install -p -D -m 700 scripts/guestAgent $(INITDIR)/guestAgent install -p -D -m 700 scripts/guestServer $(INITDIR)/guestServer @@ -30,8 +32,10 @@ override_dh_auto_install: install -d -m 755 $(MTCDIR)/tmp install -p -D -m 644 scripts/guest.ini $(MTCDIR)/guestAgent.ini install -p -D -m 644 scripts/guest.ini $(MTCDIR)/guestServer.ini - install -d -m 755 $(PMONDIR) - install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR)/guestServer.conf + install -d -m 755 $(PMONDIR_1) + install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR_1)/guestServer.conf + install -d -m 755 $(PMONDIR_2) + install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR_2)/guestServer.conf override_dh_installsystemd: dh_installsystemd --name guestServer