From 312f68fae9f48cd78c92c6656f54f679eda40d7d Mon Sep 17 00:00:00 2001 From: Leonardo Fagundes Luz Serrano Date: Thu, 15 Sep 2022 14:44:12 -0300 Subject: [PATCH] Debian: Remove conf files from etc-pmon.d Removed conf files from /etc/pmon.d/ as they are being moved to another location. This is part of an effort to allow pmon conf files to be selected at runtime by kickstarts. The change is debian-only, since centos support will be dropped soon. Centos' pmon conf files remain in /etc/pmon.d/ Test Plan: PASS - deb doesn't install anything to /etc/pmon.d/ PASS - AIOSX unlocked-enabled-available PASS - Standard 2+2 unlocked-enabled-available Story: 2010211 Task: 46307 Depends-On: https://review.opendev.org/c/starlingx/metal/+/855095 Signed-off-by: Leonardo Fagundes Luz Serrano Change-Id: Ica5dfca4778c60664e37fd3eb8768b8a159565e1 --- mtce-guest/debian/deb_folder/mtce-guest-server.install | 1 - mtce-guest/debian/deb_folder/rules | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mtce-guest/debian/deb_folder/mtce-guest-server.install b/mtce-guest/debian/deb_folder/mtce-guest-server.install index 6c0b4780..3430cf53 100644 --- a/mtce-guest/debian/deb_folder/mtce-guest-server.install +++ b/mtce-guest/debian/deb_folder/mtce-guest-server.install @@ -2,6 +2,5 @@ etc/init.d/guestServer etc/logrotate.d/guestServer.logrotate etc/mtc/guestServer.ini 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 d5682f9b..c6cabf63 100644 --- a/mtce-guest/debian/deb_folder/rules +++ b/mtce-guest/debian/deb_folder/rules @@ -7,8 +7,7 @@ export BINDIR=/usr/local/bin export INITDIR=$(ROOT)/etc/init.d export LOGDIR=$(ROOT)/etc/logrotate.d export MTCDIR=$(ROOT)/etc/mtc -export PMONDIR_1=${ROOT}/usr/share/starlingx/pmon.d -export PMONDIR_2=$(ROOT)/etc/pmon.d +export PMONDIR=${ROOT}/usr/share/starlingx/pmon.d export SYSCONFDIR=/etc export UNITDIR=/lib/systemd/system @@ -32,10 +31,8 @@ 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_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 + install -d -m 755 $(PMONDIR) + install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR)/guestServer.conf override_dh_installsystemd: dh_installsystemd --name guestServer