move all sensor daemons to libexec
Per the organization anti-pattern, executables are expected to be
installed into libexec instead of bin[1]. Update service files and
meson to install there.
[1]: https://github.com/openbmc/docs/blob/master/anti-patterns.md#incorrect-placement-of-executables-in-sbin-usrsbin-or-bin-usrbin
Change-Id: I1eb4003e94b83b09829d63346c2e16a3ff02a3e9
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/service_files/xyz.openbmc_project.adcsensor.service b/service_files/xyz.openbmc_project.adcsensor.service
index bc07f6e..399eea9 100644
--- a/service_files/xyz.openbmc_project.adcsensor.service
+++ b/service_files/xyz.openbmc_project.adcsensor.service
@@ -8,7 +8,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/adcsensor
+ExecStart=/usr/libexec/dbus-sensors/adcsensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.exitairsensor.service b/service_files/xyz.openbmc_project.exitairsensor.service
index a799c5b..7c00dd0 100644
--- a/service_files/xyz.openbmc_project.exitairsensor.service
+++ b/service_files/xyz.openbmc_project.exitairsensor.service
@@ -9,7 +9,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/exitairtempsensor
+ExecStart=/usr/libexec/dbus-sensors/exitairtempsensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.externalsensor.service b/service_files/xyz.openbmc_project.externalsensor.service
index 9df1b6d..0b3c081 100644
--- a/service_files/xyz.openbmc_project.externalsensor.service
+++ b/service_files/xyz.openbmc_project.externalsensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/externalsensor
+ExecStart=/usr/libexec/dbus-sensors/externalsensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.fansensor.service b/service_files/xyz.openbmc_project.fansensor.service
index f452ebf..7925ab5 100644
--- a/service_files/xyz.openbmc_project.fansensor.service
+++ b/service_files/xyz.openbmc_project.fansensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/fansensor
+ExecStart=/usr/libexec/dbus-sensors/fansensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.hwmontempsensor.service b/service_files/xyz.openbmc_project.hwmontempsensor.service
index 9513ac3..bf18569 100644
--- a/service_files/xyz.openbmc_project.hwmontempsensor.service
+++ b/service_files/xyz.openbmc_project.hwmontempsensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/hwmontempsensor
+ExecStart=/usr/libexec/dbus-sensors/hwmontempsensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.intelcpusensor.service b/service_files/xyz.openbmc_project.intelcpusensor.service
index 8b5be69..d999251 100644
--- a/service_files/xyz.openbmc_project.intelcpusensor.service
+++ b/service_files/xyz.openbmc_project.intelcpusensor.service
@@ -8,7 +8,7 @@
Restart=always
RestartSec=5
StartLimitBurst=10
-ExecStart=/usr/bin/intelcpusensor
+ExecStart=/usr/libexec/dbus-sensors/intelcpusensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.intrusionsensor.service b/service_files/xyz.openbmc_project.intrusionsensor.service
index 3f815ba..1b0fc0c 100644
--- a/service_files/xyz.openbmc_project.intrusionsensor.service
+++ b/service_files/xyz.openbmc_project.intrusionsensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/intrusionsensor
+ExecStart=/usr/libexec/dbus-sensors/intrusionsensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.ipmbsensor.service b/service_files/xyz.openbmc_project.ipmbsensor.service
index 9f6805d..0063813 100644
--- a/service_files/xyz.openbmc_project.ipmbsensor.service
+++ b/service_files/xyz.openbmc_project.ipmbsensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/ipmbsensor
+ExecStart=/usr/libexec/dbus-sensors/ipmbsensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.mctpreactor.service b/service_files/xyz.openbmc_project.mctpreactor.service
index 71a61fd..131f27e 100644
--- a/service_files/xyz.openbmc_project.mctpreactor.service
+++ b/service_files/xyz.openbmc_project.mctpreactor.service
@@ -11,7 +11,7 @@
Restart=always
RestartSec=5
-ExecStart=/usr/bin/mctpreactor
+ExecStart=/usr/libexec/dbus-sensors/mctpreactor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.mcutempsensor.service b/service_files/xyz.openbmc_project.mcutempsensor.service
index d4d16e4..75f0511 100644
--- a/service_files/xyz.openbmc_project.mcutempsensor.service
+++ b/service_files/xyz.openbmc_project.mcutempsensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/mcutempsensor
+ExecStart=/usr/libexec/dbus-sensors/mcutempsensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.nvidiagpusensor.service b/service_files/xyz.openbmc_project.nvidiagpusensor.service
index c09e6a5..71b23d2 100644
--- a/service_files/xyz.openbmc_project.nvidiagpusensor.service
+++ b/service_files/xyz.openbmc_project.nvidiagpusensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/nvidiagpusensor
+ExecStart=/usr/libexec/dbus-sensors/nvidiagpusensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.nvmesensor.service b/service_files/xyz.openbmc_project.nvmesensor.service
index e94bf9b..9daf243 100644
--- a/service_files/xyz.openbmc_project.nvmesensor.service
+++ b/service_files/xyz.openbmc_project.nvmesensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/nvmesensor
+ExecStart=/usr/libexec/dbus-sensors/nvmesensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.psusensor.service b/service_files/xyz.openbmc_project.psusensor.service
index 4b22e8c..ff6dcfc 100644
--- a/service_files/xyz.openbmc_project.psusensor.service
+++ b/service_files/xyz.openbmc_project.psusensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/psusensor
+ExecStart=/usr/libexec/dbus-sensors/psusensor
[Install]
WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.smbpbisensor.service b/service_files/xyz.openbmc_project.smbpbisensor.service
index 88e839b..fe1438f 100644
--- a/service_files/xyz.openbmc_project.smbpbisensor.service
+++ b/service_files/xyz.openbmc_project.smbpbisensor.service
@@ -7,7 +7,7 @@
[Service]
Restart=always
RestartSec=5
-ExecStart=/usr/bin/smbpbisensor
+ExecStart=/usr/libexec/dbus-sensors/smbpbisensor
[Install]
WantedBy=multi-user.target
diff --git a/src/adc/meson.build b/src/adc/meson.build
index 2ba92df..2257313 100644
--- a/src/adc/meson.build
+++ b/src/adc/meson.build
@@ -7,4 +7,5 @@
dependencies: [default_deps, gpiodcxx, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/exit-air/meson.build b/src/exit-air/meson.build
index 2fb862b..bcd02fd 100644
--- a/src/exit-air/meson.build
+++ b/src/exit-air/meson.build
@@ -6,4 +6,5 @@
dependencies: [default_deps, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/external/meson.build b/src/external/meson.build
index 774a123..7122b14 100644
--- a/src/external/meson.build
+++ b/src/external/meson.build
@@ -7,4 +7,5 @@
dependencies: [default_deps, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/fan/meson.build b/src/fan/meson.build
index 1567a8e..2fbeefc 100644
--- a/src/fan/meson.build
+++ b/src/fan/meson.build
@@ -9,4 +9,5 @@
dependencies: [default_deps, gpiodcxx, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/hwmon-temp/meson.build b/src/hwmon-temp/meson.build
index 431335f..fe41321 100644
--- a/src/hwmon-temp/meson.build
+++ b/src/hwmon-temp/meson.build
@@ -7,4 +7,5 @@
dependencies: [default_deps, devicemgmt_dep, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/intel-cpu/meson.build b/src/intel-cpu/meson.build
index 8e519af..c3e3468 100644
--- a/src/intel-cpu/meson.build
+++ b/src/intel-cpu/meson.build
@@ -10,4 +10,5 @@
dependencies: [default_deps, gpiodcxx, thresholds_dep, utils_dep, peci_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/intrusion/meson.build b/src/intrusion/meson.build
index a62052c..bb7f188 100644
--- a/src/intrusion/meson.build
+++ b/src/intrusion/meson.build
@@ -7,4 +7,5 @@
dependencies: [default_deps, gpiodcxx, i2c, utils_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/ipmb/meson.build b/src/ipmb/meson.build
index ddab113..1ac9878 100644
--- a/src/ipmb/meson.build
+++ b/src/ipmb/meson.build
@@ -8,4 +8,5 @@
dependencies: [default_deps, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/leakdetector/meson.build b/src/leakdetector/meson.build
index aa953e4..83225b8 100644
--- a/src/leakdetector/meson.build
+++ b/src/leakdetector/meson.build
@@ -17,5 +17,5 @@
],
include_directories: src_inc,
install: true,
- install_dir: get_option('libexecdir') / 'dbus-sensors',
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/mctp/meson.build b/src/mctp/meson.build
index 32009c7..d907418 100644
--- a/src/mctp/meson.build
+++ b/src/mctp/meson.build
@@ -5,4 +5,5 @@
'MCTPEndpoint.cpp',
dependencies: [default_deps, utils_dep],
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/mcu/meson.build b/src/mcu/meson.build
index e596e3e..250ff3e 100644
--- a/src/mcu/meson.build
+++ b/src/mcu/meson.build
@@ -6,4 +6,5 @@
dependencies: [default_deps, i2c, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/nvidia-gpu/meson.build b/src/nvidia-gpu/meson.build
index 97b6da5..cf7c8c5 100644
--- a/src/nvidia-gpu/meson.build
+++ b/src/nvidia-gpu/meson.build
@@ -16,6 +16,7 @@
include_directories: [gpusensor_include_dir, sensor_include_dir],
dependencies: [thresholds_dep, utils_dep],
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
if get_option('tests').enabled()
diff --git a/src/nvme/meson.build b/src/nvme/meson.build
index 801201e..9f2193e 100644
--- a/src/nvme/meson.build
+++ b/src/nvme/meson.build
@@ -10,4 +10,5 @@
dependencies: nvme_deps,
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/psu/meson.build b/src/psu/meson.build
index 20af98c..9e3ee7b 100644
--- a/src/psu/meson.build
+++ b/src/psu/meson.build
@@ -14,4 +14,5 @@
],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)
diff --git a/src/smbpbi/meson.build b/src/smbpbi/meson.build
index 5ca4c21..cb389e2 100644
--- a/src/smbpbi/meson.build
+++ b/src/smbpbi/meson.build
@@ -6,4 +6,5 @@
dependencies: [default_deps, i2c, thresholds_dep, utils_dep],
include_directories: src_inc,
install: true,
+ install_dir: '/usr/libexec/dbus-sensors',
)