From 555deebdb4ec6a441280f903f9d5a74b28d423b1 Mon Sep 17 00:00:00 2001 From: Leonardo Fagundes Luz Serrano Date: Thu, 15 Sep 2022 14:45:27 -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: 46308 Depends-On: https://review.opendev.org/c/starlingx/metal/+/855095 Signed-off-by: Leonardo Fagundes Luz Serrano Change-Id: Ic406157798161d67520913579edd1065b6626128 --- sw-patch/debian/deb_folder/cgcs-patch-agent.dirs | 2 -- sw-patch/debian/deb_folder/cgcs-patch-agent.install | 1 - sw-patch/debian/deb_folder/cgcs-patch-controller.dirs | 2 -- sw-patch/debian/deb_folder/cgcs-patch-controller.install | 1 - sw-patch/debian/deb_folder/rules | 5 ----- 5 files changed, 11 deletions(-) diff --git a/sw-patch/debian/deb_folder/cgcs-patch-agent.dirs b/sw-patch/debian/deb_folder/cgcs-patch-agent.dirs index a1e3ade6..ba89452f 100644 --- a/sw-patch/debian/deb_folder/cgcs-patch-agent.dirs +++ b/sw-patch/debian/deb_folder/cgcs-patch-agent.dirs @@ -1,5 +1,3 @@ etc/init.d -etc/pmon.d lib/systemd/system usr/sbin -usr/share/starlingx/pmon.d diff --git a/sw-patch/debian/deb_folder/cgcs-patch-agent.install b/sw-patch/debian/deb_folder/cgcs-patch-agent.install index 92a7c35d..237a8d26 100644 --- a/sw-patch/debian/deb_folder/cgcs-patch-agent.install +++ b/sw-patch/debian/deb_folder/cgcs-patch-agent.install @@ -1,5 +1,4 @@ etc/init.d/sw-patch-agent -etc/pmon.d/sw-patch-agent.conf lib/systemd/system/sw-patch-agent.service usr/sbin/sw-patch-agent usr/sbin/sw-patch-agent-restart diff --git a/sw-patch/debian/deb_folder/cgcs-patch-controller.dirs b/sw-patch/debian/deb_folder/cgcs-patch-controller.dirs index 14c3ca04..1d89a6be 100644 --- a/sw-patch/debian/deb_folder/cgcs-patch-controller.dirs +++ b/sw-patch/debian/deb_folder/cgcs-patch-controller.dirs @@ -1,6 +1,4 @@ etc/init.d -etc/pmon.d lib/systemd/system usr/sbin usr/share/bash-completion/completions -usr/share/starlingx/pmon.d diff --git a/sw-patch/debian/deb_folder/cgcs-patch-controller.install b/sw-patch/debian/deb_folder/cgcs-patch-controller.install index efb7e5d0..9d03acfc 100644 --- a/sw-patch/debian/deb_folder/cgcs-patch-controller.install +++ b/sw-patch/debian/deb_folder/cgcs-patch-controller.install @@ -1,6 +1,5 @@ etc/init.d/sw-patch-controller etc/init.d/sw-patch-controller-daemon -etc/pmon.d/sw-patch-controller-daemon.conf lib/systemd/system/sw-patch-controller.service lib/systemd/system/sw-patch-controller-daemon.service usr/sbin/sw-patch diff --git a/sw-patch/debian/deb_folder/rules b/sw-patch/debian/deb_folder/rules index 1e83ecd8..f1b5eb8a 100755 --- a/sw-patch/debian/deb_folder/rules +++ b/sw-patch/debian/deb_folder/rules @@ -27,7 +27,6 @@ override_dh_install: install -m 755 -d ${DEBIAN_DESTDIR}/etc/logrotate.d install -m 755 -d ${DEBIAN_DESTDIR}/etc/patching install -m 700 -d ${DEBIAN_DESTDIR}/etc/patching/patch-scripts - install -m 755 -d ${DEBIAN_DESTDIR}/etc/pmon.d install -m 755 -d ${DEBIAN_DESTDIR}/lib/systemd/system install -m 755 -d ${PMONDIR} @@ -45,10 +44,6 @@ override_dh_install: ${DEBIAN_DESTDIR}/etc/patching/patching.conf install -m 644 bin/policy.json \ ${DEBIAN_DESTDIR}/etc/patching/policy.json - install -m 444 bin/pmon-sw-patch-controller-daemon.conf \ - ${DEBIAN_DESTDIR}/etc/pmon.d/sw-patch-controller-daemon.conf - install -m 444 bin/pmon-sw-patch-agent.conf \ - ${DEBIAN_DESTDIR}/etc/pmon.d/sw-patch-agent.conf install -m 444 bin/pmon-sw-patch-controller-daemon.conf \ ${PMONDIR}/sw-patch-controller-daemon.conf install -m 444 bin/pmon-sw-patch-agent.conf \