meta-fii/meta-kudo: Organize executables to follow anti-patterns.md

According to
https://github.com/openbmc/docs/blob/master/anti-patterns.md,
/usr/sbin is reserved for system administration executables. The
executables called by services or internal use are placed in
/usr/libexec/<package>.

Executables kept in /usr/sbin,
- kudo.sh
- kudo-ras.sh
- kudo-fw.sh

Executables moved to /usr/libexec,
- ampere-hostctrl/ampere_power_util.sh
- kudo-fw/kudo-fw-ver.sh
- kudo-fw/kudo-lib.sh
- kudo-boot/init_once.sh
- usb-network/usb_network.sh
- obmc-console/kudo_uart_mux_ctrl.sh
- pwm-init/pwm_init.sh
- phosphor-virtual-sensor/tla2024-enable.sh

Also removed /usr/bin/env from service files.

Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com>
Change-Id: I270eee5cb9c0ca248f1b84a87d1cff5c6dc129f3

30 files changed, 45 insertions, 47 deletions

diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
index 5e41d6b9e3..cc5bf78821 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
@@ -68,6 +68,6 @@ FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
 SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}"
 
 do_install() {
-    install -d ${D}/usr/sbin
-    install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}/${sbindir}/ampere_power_util.sh
+    install -d ${D}${libexecdir}/${PN}
+    install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}${libexecdir}/${PN}/ampere_power_util.sh
 }
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-powercycle.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-powercycle.service
index c55fcd3db3..fb5fff94a2 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-powercycle.service
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-powercycle.service
@@ -4,5 +4,5 @@ Description=Ampere Computing LLC Power OFF Chassis
 [Service]
 RemainAfterExit=no
 Type=oneshot
-ExecStart=/usr/bin/env ampere_power_util.sh mb hotswap
+ExecStart=/usr/libexec/ampere-hostctrl/ampere_power_util.sh mb hotswap
 SyslogIdentifier=ampere_power_util.sh
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweroff.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweroff.service
index c3a4dce375..30407471fe 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweroff.service
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweroff.service
@@ -7,6 +7,5 @@ Conflicts=obmc-chassis-poweron@0.target
 [Service]
 RemainAfterExit=no
 Type=oneshot
-ExecStart=/usr/bin/env ampere_power_util.sh mb off
+ExecStart=/usr/libexec/ampere-hostctrl/ampere_power_util.sh mb off
 SyslogIdentifier=ampere_power_util.sh
-
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweron.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweron.service
index 1ab492202e..95561cef3a 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweron.service
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweron.service
@@ -5,6 +5,5 @@ Conflicts=obmc-chassis-poweroff@0.target
 [Service]
 RemainAfterExit=yes
 Type=oneshot
-ExecStart=/usr/bin/env ampere_power_util.sh mb on
+ExecStart=/usr/libexec/ampere-hostctrl/ampere_power_util.sh mb on
 SyslogIdentifier=ampere_power_util.sh
-
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service
index b020aa3f29..87c437179d 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service
@@ -8,6 +8,5 @@ After=kudo-bios-verify.service
 [Service]
 RemainAfterExit=no
 Type=oneshot
-ExecStart=/usr/bin/env ampere_power_util.sh mb host_cycle
+ExecStart=/usr/libexec/ampere-hostctrl/ampere_power_util.sh mb host_cycle
 SyslogIdentifier=ampere_power_util.sh
-
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service
index 830fb44975..c3ae7b9ab5 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service
@@ -8,5 +8,5 @@ After=kudo-bios-verify.service
 [Service]
 RemainAfterExit=no
 Type=oneshot
-ExecStart=/usr/bin/env ampere_power_util.sh mb host_reset
-SyslogIdentifier=ampere_power_util.sh
\ No newline at end of file
+ExecStart=/usr/libexec/ampere-hostctrl/ampere_power_util.sh mb host_reset
+SyslogIdentifier=ampere_power_util.sh
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown-ack.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown-ack.service
index fe05915ac4..eb3eb4ca81 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown-ack.service
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown-ack.service
@@ -7,6 +7,5 @@ Conflicts=obmc-chassis-poweron@0.target
 [Service]
 RemainAfterExit=no
 Type=oneshot
-ExecStart=/usr/bin/env ampere_power_util.sh mb shutdown_ack
+ExecStart=/usr/libexec/ampere-hostctrl/ampere_power_util.sh mb shutdown_ack
 SyslogIdentifier=ampere_power_util.sh
-
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown.service
index b7a458eded..5fec8fa784 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown.service
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown.service
@@ -6,6 +6,5 @@ OnFailure=obmc-chassis-poweroff@0.target
 [Service]
 RemainAfterExit=no
 Type=oneshot
-ExecStart=/usr/bin/env ampere_power_util.sh mb graceful_shutdown
+ExecStart=/usr/libexec/ampere-hostctrl/ampere_power_util.sh mb graceful_shutdown
 SyslogIdentifier=ampere_power_util.sh
-
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh
index d9bcb0cf27..877951313c 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh
+++ b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /usr/sbin/kudo-lib.sh
+source /usr/libexec/kudo-fw/kudo-lib.sh
 
 # Usage of this utility
 function usage() {
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update/phosphor-ipmi-flash-bios-update.service b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update/phosphor-ipmi-flash-bios-update.service
index 1702153d7b..cc5f4aad88 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update/phosphor-ipmi-flash-bios-update.service
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update/phosphor-ipmi-flash-bios-update.service
@@ -3,4 +3,4 @@ Description=Phosphor-ipmi-flash update BIOS firmware service
 
 [Service]
 ExecStart=/usr/sbin/kudo-fw.sh bios /run/initramfs/bios-image
-Type=oneshot
\ No newline at end of file
+Type=oneshot
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
index 28d276f966..9b5d32d4b2 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
@@ -27,10 +27,11 @@ SYSTEMD_SERVICE:${PN} = " \
     "
 
 do_install () {
-    install -d ${D}/${sbindir}
-    install -m 0755 ${WORKDIR}/kudo-fw.sh ${D}/${sbindir}/kudo-fw.sh
-    install -m 0755 ${WORKDIR}/kudo-fw-ver.sh ${D}/${sbindir}/kudo-fw-ver.sh
-    install -m 0755 ${WORKDIR}/kudo-lib.sh ${D}/${sbindir}/kudo-lib.sh
+    install -d ${D}${sbindir}
+    install -d ${D}${libexecdir}/${PN}
+    install -m 0755 ${WORKDIR}/kudo-fw.sh ${D}${sbindir}/kudo-fw.sh
+    install -m 0755 ${WORKDIR}/kudo-fw-ver.sh ${D}${libexecdir}/${PN}/kudo-fw-ver.sh
+    install -m 0755 ${WORKDIR}/kudo-lib.sh ${D}${libexecdir}/${PN}/kudo-lib.sh
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/kudo-fw-ver.service ${D}${systemd_system_unitdir}
 }
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.service b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.service
index 24e21d2367..a49dcb44fc 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.service
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.service
@@ -4,7 +4,7 @@ Description=Firmware Version Daemon
 [Service]
 RemainAfterExit=yes
 Type=oneshot
-ExecStart=/usr/sbin/kudo-fw-ver.sh
+ExecStart=/usr/libexec/kudo-fw/kudo-fw-ver.sh
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh
index bb35b29be8..0f8868f073 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh
@@ -2,7 +2,7 @@
 
 devpath="/sys/bus/i2c/devices/13-0077/driver"
 
-source /usr/sbin/kudo-lib.sh
+source /usr/libexec/kudo-fw/kudo-lib.sh
 
 function fwbios() {
   KERNEL_FIU_ID="c0000000.spi"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
index c800f266e6..57ddc666b8 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
@@ -23,8 +23,8 @@ SYSTEMD_SERVICE:${PN} = " \
     "
 
 do_install () {
-    install -d ${D}${sbindir}
-    install -m 0755 ${WORKDIR}/init_once.sh ${D}${sbindir}/
+    install -d ${D}${libexecdir}/${PN}
+    install -m 0755 ${WORKDIR}/init_once.sh ${D}${libexecdir}/${PN}/init_once.sh
     install -d ${D}${systemd_unitdir}/system/
     install -m 0644 ${WORKDIR}/host-powerctrl.service ${D}${systemd_unitdir}/system
 }
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service
index 8a8d46f14e..072cf8fa9f 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service
@@ -9,7 +9,7 @@ After=kudo-bios-verify.service
 Restart=no
 RemainAfterExit=true
 Type=oneshot
-ExecStart=/usr/sbin/init_once.sh
+ExecStart=/usr/libexec/kudo-boot/init_once.sh
 StandardOutput=syslog
 
 [Install]
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh
index 7f1c39d28e..ea13b17e00 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /usr/sbin/kudo-lib.sh
+source /usr/libexec/kudo-fw/kudo-lib.sh
 
 function set_mux_default(){
     # set all mux route to CPU before power on host
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
index 324bd640c5..617e71ce0f 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
@@ -15,7 +15,7 @@ SRC_URI = " \
 SYSTEMD_PACKAGES = "${PN}"
 
 do_install () {
-    install -d ${D}/${sbindir}
-    install -m 0755 ${WORKDIR}/kudo.sh ${D}/${sbindir}/kudo.sh
-    install -m 0755 ${WORKDIR}/kudo-ras.sh ${D}/${sbindir}/kudo-ras.sh
+    install -d ${D}${sbindir}
+    install -m 0755 ${WORKDIR}/kudo.sh ${D}${sbindir}/kudo.sh
+    install -m 0755 ${WORKDIR}/kudo-ras.sh ${D}${sbindir}/kudo-ras.sh
 }
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo.sh
index 3a528abb4d..b8e7824380 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo.sh
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # help information
 
-source /usr/sbin/kudo-lib.sh
+source /usr/libexec/kudo-fw/kudo-lib.sh
 
 function usage_rst() {
   echo " kudo rst [parameter]"
diff --git a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
index 6e7be67c2c..5668840d29 100644
--- a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
@@ -18,8 +18,8 @@ SYSTEMD_SERVICE:${PN}:append = " usb_network.service"
 FILES:${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
 
 do_install() {
-    install -d ${D}/${sbindir}
-    install -m 0755 ${WORKDIR}/usb_network.sh ${D}/${sbindir}
+    install -d ${D}${libexecdir}/${PN}
+    install -m 0755 ${WORKDIR}/usb_network.sh ${D}${libexecdir}/${PN}/usb_network.sh
 
     install -d ${D}${systemd_unitdir}/system/
     install -m 0644 ${WORKDIR}/usb_network.service ${D}${systemd_unitdir}/system
diff --git a/meta-fii/meta-kudo/recipes-kudo/network/usb-network/usb_network.service b/meta-fii/meta-kudo/recipes-kudo/network/usb-network/usb_network.service
index 81a4e42442..d5115fe6d6 100644
--- a/meta-fii/meta-kudo/recipes-kudo/network/usb-network/usb_network.service
+++ b/meta-fii/meta-kudo/recipes-kudo/network/usb-network/usb_network.service
@@ -4,7 +4,7 @@ After=phosphor-ipmi-host.service
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash -c '/usr/sbin/usb_network.sh'
+ExecStart=/bin/bash -c '/usr/libexec/usb-network/usb_network.sh'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/kudo_uart_mux_ctrl.sh b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/kudo_uart_mux_ctrl.sh
index 7b131afbf3..ae5ad372c5 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/kudo_uart_mux_ctrl.sh
+++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/kudo_uart_mux_ctrl.sh
@@ -18,7 +18,7 @@
 # Usage: ampere_uartmux_ctrl.sh <CPU UART port number> <UARTx_MODE>
 #        <UARTx_MODE> of 1 sets CPU To BSP
 #        <UARTx_MODE> of 2 sets SCP1 to SI2 
-source /usr/sbin/kudo-lib.sh
+source /usr/libexec/kudo-fw/kudo-lib.sh
 
 if [ $# -lt 1 ]; then
   exit 1
@@ -39,4 +39,3 @@ case "$1" in
     echo "Invalid tty passed to $0. Exiting!" > /dev/ttyS0
     ;;
 esac
-
diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/obmc-console@.service
index 695eec31cd..3b6959e9b4 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/obmc-console@.service
+++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/obmc-console@.service
@@ -6,7 +6,7 @@ StartLimitBurst=3
 StartLimitIntervalSec=300
 
 [Service]
-ExecStartPre=/usr/sbin/kudo_uart_mux_ctrl.sh %i
+ExecStartPre=/usr/libexec/obmc-console/kudo_uart_mux_ctrl.sh %i
 ExecStart=/usr/sbin/obmc-console-server --config /etc/obmc-console/server.%i.conf %i
 SyslogIdentifier=obmc-console-server
 Restart=always
diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend
index b08aab399e..990c709ba5 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend
@@ -30,8 +30,8 @@ do_install:append() {
 
     # Overwrite base package's obmc-console@.service with our own
     install -m 0644 ${WORKDIR}/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service
-    install -d ${D}/usr/sbin
-    install -m 0755 ${WORKDIR}/kudo_uart_mux_ctrl.sh ${D}/${sbindir}/kudo_uart_mux_ctrl.sh
+    install -d ${D}${libexecdir}/${PN}
+    install -m 0755 ${WORKDIR}/kudo_uart_mux_ctrl.sh ${D}${libexecdir}/${PN}/kudo_uart_mux_ctrl.sh
 
 }
 
@@ -39,3 +39,4 @@ pkg_postinst:${PN}:append () {
     systemctl --root=$D enable obmc-console@ttyS1.service
     systemctl --root=$D enable obmc-console@ttyS3.service
 }
+
diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb
index f4b04e60bc..97daab696e 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb
+++ b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb
@@ -22,8 +22,8 @@ SYSTEMD_SERVICE:${PN} += "pwm_init.service"
 FILES:${PN} += "${bindir}/* ${systemd_system_unitdir}/*"
 
 do_install:append() {
-    install -d ${D}${bindir}
-    install -m 0755 ${S}/bin/* ${D}${bindir}/
+    install -d ${D}${libexecdir}/${PN}
+    install -m 0755 ${S}/bin/* ${D}${libexecdir}/${PN}/
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${S}/*.service ${D}${systemd_system_unitdir}
 }
diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init/pwm_init.service b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init/pwm_init.service
index 981b8773c5..351d5f15b4 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init/pwm_init.service
+++ b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init/pwm_init.service
@@ -4,7 +4,7 @@ Before=xyz.openbmc_project.fansensor.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/pwm_init.sh
+ExecStart=/usr/libexec/pwm-init/pwm_init.sh
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/tla2024-enable.service b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/tla2024-enable.service
index 8d4259441d..3bdf0ef3ca 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/tla2024-enable.service
+++ b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/tla2024-enable.service
@@ -3,7 +3,7 @@ Description=TLA2024 change scale property
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/tla2024-enable.sh
+ExecStart=/usr/libexec/phosphor-virtual-sensor/tla2024-enable.sh
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index f89f5d9a78..17a0dfb28b 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -14,7 +14,9 @@ FILES:${PN}:append:kudo = " ${bindir}/tla2024-enable.sh"
 do_install:append:kudo() {
     install -d ${D}${datadir}/${PN}
     install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/${PN}/virtual_sensor_config.json
-    install -m 0755 ${WORKDIR}/tla2024-enable.sh ${D}${bindir}/tla2024-enable.sh
+
+    install -d ${D}${libexecdir}/${PN}
+    install -m 0755 ${WORKDIR}/tla2024-enable.sh ${D}${libexecdir}/${PN}/tla2024-enable.sh
 
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/tla2024-enable.service ${D}${systemd_system_unitdir}/tla2024-enable.service
diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service
index 73aabb6ed9..68b1fb45dc 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service
+++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service
@@ -4,5 +4,5 @@ Description=Watchdog power state power hotswap
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart=/usr/bin/env kudo.sh rst hotswap
+ExecStart=/usr/sbin/kudo.sh rst hotswap
 SyslogIdentifier=phosphor-watchdog
diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service
index 1baf4ca306..33dbe4bfc8 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service
+++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service
@@ -4,5 +4,5 @@ Description=Watchdog power state power cycle shutdown
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart=/usr/bin/env ampere_power_util.sh mb off
+ExecStart=/usr/libexec/ampere-hostctrl/ampere_power_util.sh mb off
 SyslogIdentifier=phosphor-watchdog
diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service
index b6d453f514..cd7e26180b 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service
+++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service
@@ -4,5 +4,5 @@ Description=Watchdog power state reset system
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart=/usr/bin/env ampere_power_util.sh mb force_reset
+ExecStart=/usr/libexec/ampere-hostctrl/ampere_power_util.sh mb force_reset
 SyslogIdentifier=phosphor-watchdog