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/

Also refatored containerd-config debian files

Test Plan:
PASS - deb doesn't install anything to /etc/pmon.d/
PASS - containerd-config debian pkg has the same
       filepaths and permissions
PASS - AIOSX unlocked-enabled-available
PASS - Standard 2+2 unlocked-enabled-available

Story: 2010211
Task: 46302

Depends-On: https://review.opendev.org/c/starlingx/metal/+/855095

Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com>
Change-Id: Ifee02f5ee23ce8c1dca9c011ff3a2ae144765e85
This commit is contained in:
Leonardo Fagundes Luz Serrano
2022-09-15 12:30:40 -03:00
parent ad8126ca91
commit 68ed69d303
4 changed files with 8 additions and 13 deletions

View File

@@ -1,2 +1,2 @@
containerd-stx-override.conf /etc/systemd/system/containerd.service.d
containerd-pmon.conf /etc/pmon.d
etc/systemd/system/containerd.service.d/containerd-stx-override.conf
usr/share/starlingx/pmon.d/containerd.conf

View File

@@ -1,6 +0,0 @@
#!/bin/sh
cp /etc/pmon.d/containerd-pmon.conf /usr/share/starlingx/pmon.d/containerd.conf
mv /etc/pmon.d/containerd-pmon.conf /etc/pmon.d/containerd.conf
#DEBHELPER#

View File

@@ -1,7 +1,9 @@
#!/usr/bin/make -f
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
#export DH_VERBOSE = 1
%:
dh $@
override_dh_install:
install -D -m 644 containerd-pmon.conf usr/share/starlingx/pmon.d/containerd.conf
install -D -m 644 containerd-stx-override.conf etc/systemd/system/containerd.service.d/containerd-stx-override.conf
dh_install

View File

@@ -1,4 +1,3 @@
docker-stx-override.conf etc/systemd/system/docker.service.d
docker.logrotate etc/logrotate.d
docker.conf etc/pmon.d
docker.conf usr/share/starlingx/pmon.d
docker.conf usr/share/starlingx/pmon.d