starlingx
/
update
Code Issues Proposed changes

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: 46115

Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com>
Change-Id: I1379b3c7f2fbdec1a265632ef60f0c86285ff64c
This commit is contained in:
Leonardo Fagundes Luz Serrano 2022-08-23 23:29:24 -03:00
parent 9cb0e99158
commit 1c402ba0ea
5 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sw-patch/debian/deb_folder/cgcs-patch-agent.dirs
View File

@ -1,4 +1,5 @@
usr/sbin
etc/pmon.d
etc/init.d
etc/pmon.d
lib/systemd/system
usr/sbin
usr/share/starlingx/pmon.d

7
sw-patch/debian/deb_folder/cgcs-patch-agent.install
View File

@ -1,5 +1,6 @@
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
etc/pmon.d/sw-patch-agent.conf
etc/init.d/sw-patch-agent
lib/systemd/system/sw-patch-agent.service
usr/share/starlingx/pmon.d/sw-patch-agent.conf

5
sw-patch/debian/deb_folder/cgcs-patch-controller.dirs
View File

@ -1,5 +1,6 @@
usr/sbin
etc/pmon.d
etc/init.d
etc/pmon.d
lib/systemd/system
usr/sbin
usr/share/bash-completion/completions
usr/share/starlingx/pmon.d

11
sw-patch/debian/deb_folder/cgcs-patch-controller.install
View File

@ -1,10 +1,11 @@
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
usr/sbin/sw-patch-controller-daemon
usr/sbin/sw-patch-controller-daemon-restart
usr/sbin/upgrade-start-pkg-extract
etc/pmon.d/sw-patch-controller-daemon.conf
etc/init.d/sw-patch-controller-daemon
etc/init.d/sw-patch-controller
lib/systemd/system/sw-patch-controller-daemon.service
usr/share/bash-completion/completions/sw-patch
lib/systemd/system/sw-patch-controller.service
usr/share/starlingx/pmon.d/sw-patch-controller-daemon.conf

15
sw-patch/debian/deb_folder/rules
View File

@ -3,6 +3,7 @@
export PYBUILD_NAME=cgcs-patch
DEBIAN_DESTDIR := $(CURDIR)/debian/tmp
PMONDIR := ${DEBIAN_DESTDIR}/usr/share/starlingx/pmon.d
%:
dh $@ --with python3 --buildsystem=pybuild
@ -28,6 +29,8 @@ override_dh_install:
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}
install -m 500 bin/sw-patch-agent \
${DEBIAN_DESTDIR}/usr/sbin/sw-patch-agent
install -m 500 bin/sw-patch-controller-daemon \
@ -43,11 +46,17 @@ override_dh_install:
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
${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/*.service ${DEBIAN_DESTDIR}/lib/systemd/system
install -m 444 bin/sw-patch.completion ${DEBIAN_DESTDIR}/usr/share/bash-completion/completions/sw-patch
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 \
${PMONDIR}/sw-patch-agent.conf
install -m 444 bin/*.service \
${DEBIAN_DESTDIR}/lib/systemd/system
install -m 444 bin/sw-patch.completion \
${DEBIAN_DESTDIR}/usr/share/bash-completion/completions/sw-patch
install -m 400 bin/patch-functions \
${DEBIAN_DESTDIR}/etc/patching/patch-functions
install -D -m 444 bin/patch-tmpdirs.conf \