From d380292b8a88694f0714d0ded38f5df0a5d67aa5 Mon Sep 17 00:00:00 2001 From: Dan Voiculeasa Date: Thu, 25 Aug 2022 18:16:04 +0300 Subject: [PATCH] Debian: Package mtce-guest services the proper way This work only affects Debian. Currently guestServer.service is not part of the designed package (mtce-guest-server), but part of mtce-guest-agent. Fix packaging to deliver the file in the designed package. Fix because we don't want anything related to this to bite us later. This is a follow-up to [1]. Tests: PASS: build-pkgs guestAgent.service is part of mtce-guest-agent guestServer.service is part of mtce-guest-server PASS: build-image PASS: Standard lab deployed [1]: https://review.opendev.org/c/starlingx/nfv/+/830596 Story: 2009101 Task: 44323 Signed-off-by: Dan Voiculeasa Change-Id: I55b3901120af424353c9d18f2f4d2855f4f7605b --- ...guestAgent.service => mtce-guest-agent.guestAgent.service} | 0 ...stServer.service => mtce-guest-server.guestServer.service} | 0 mtce-guest/debian/deb_folder/rules | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename mtce-guest/debian/deb_folder/{guestAgent.service => mtce-guest-agent.guestAgent.service} (100%) rename mtce-guest/debian/deb_folder/{guestServer.service => mtce-guest-server.guestServer.service} (100%) diff --git a/mtce-guest/debian/deb_folder/guestAgent.service b/mtce-guest/debian/deb_folder/mtce-guest-agent.guestAgent.service similarity index 100% rename from mtce-guest/debian/deb_folder/guestAgent.service rename to mtce-guest/debian/deb_folder/mtce-guest-agent.guestAgent.service diff --git a/mtce-guest/debian/deb_folder/guestServer.service b/mtce-guest/debian/deb_folder/mtce-guest-server.guestServer.service similarity index 100% rename from mtce-guest/debian/deb_folder/guestServer.service rename to mtce-guest/debian/deb_folder/mtce-guest-server.guestServer.service diff --git a/mtce-guest/debian/deb_folder/rules b/mtce-guest/debian/deb_folder/rules index 3e377e27..74f064a0 100644 --- a/mtce-guest/debian/deb_folder/rules +++ b/mtce-guest/debian/deb_folder/rules @@ -34,8 +34,8 @@ override_dh_auto_install: install -p -D -m 644 scripts/guestServer.pmon $(PMONDIR)/guestServer.conf override_dh_installsystemd: - dh_installsystemd --name guestServer - dh_installsystemd --no-enable --name guestAgent + dh_installsystemd -pmtce-guest-server --name guestServer guestServer.service + dh_installsystemd -pmtce-guest-agent --no-enable --name guestAgent guestAgent.service override_dh_fixperms: dh_fixperms -XguestAgent -XguestServer