From d39f461031a2c2e6daa09fe405cec625843f570d Mon Sep 17 00:00:00 2001 From: Lucas Cavalcante Date: Tue, 8 Mar 2022 10:58:43 -0300 Subject: [PATCH] Fix pmon scripts path (Debian) Puppet expects pmon-* executables to be found at /usr/local/sbin, therefore Debian should install these files at the correct location. Test Plan: PASS: Unlock controller (Debian) SKIPPED: Unlock controller (Centos) Story: 2009101 Task: 44711 Change-Id: I5abe5a4c79b58c0a58649f74f54475cca8d29593 Signed-off-by: Lucas Cavalcante --- mtce/debian/deb_folder/mtce-pmon.install | 6 +++--- mtce/debian/deb_folder/rules | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mtce/debian/deb_folder/mtce-pmon.install b/mtce/debian/deb_folder/mtce-pmon.install index 6511063f..ec2c465c 100644 --- a/mtce/debian/deb_folder/mtce-pmon.install +++ b/mtce/debian/deb_folder/mtce-pmon.install @@ -5,6 +5,6 @@ usr/bin/pmond usr/lib/libamon.so usr/lib/libamon.so.1 usr/lib/libamon.so.1.0 -usr/sbin/pmon-restart -usr/sbin/pmon-start -usr/sbin/pmon-stop +usr/local/sbin/pmon-restart +usr/local/sbin/pmon-start +usr/local/sbin/pmon-stop diff --git a/mtce/debian/deb_folder/rules b/mtce/debian/deb_folder/rules index 3f97b909..fdf8a3ba 100644 --- a/mtce/debian/deb_folder/rules +++ b/mtce/debian/deb_folder/rules @@ -7,6 +7,7 @@ export LIBDIR = $(ROOT)/usr/lib export MTCESHAREDIR = $(ROOT)/usr/share/mtce export OCFPLATFORMDIR = $(ROOT)/usr/lib/ocf/resource.d/platform export SBINDIR = $(ROOT)/usr/sbin +export LOCAL_SBINDIR = $(ROOT)/usr/local/sbin export UNITDIR=$(ROOT)/lib/systemd/system export SYSCONFDIR = $(ROOT)/etc @@ -64,9 +65,9 @@ override_dh_auto_install: install -m 755 -d $(SBINDIR) install -m 700 -p -D fsync/fsync $(SBINDIR)/fsync install -m 755 -d $(SBINDIR) - install -m 700 -p -D pmon/scripts/pmon-restart $(SBINDIR)/pmon-restart - install -m 700 -p -D pmon/scripts/pmon-start $(SBINDIR)/pmon-start - install -m 700 -p -D pmon/scripts/pmon-stop $(SBINDIR)/pmon-stop + install -m 700 -p -D pmon/scripts/pmon-restart $(LOCAL_SBINDIR)/pmon-restart + install -m 700 -p -D pmon/scripts/pmon-start $(LOCAL_SBINDIR)/pmon-start + install -m 700 -p -D pmon/scripts/pmon-stop $(LOCAL_SBINDIR)/pmon-stop # init script files install -m 755 -d $(INITDIR)