Ensuring EntityManager starts before all Sensor services
This fix was needed by PSUSensor
However, all of these Sensor services are written in a similar way
All could probably benefit from this similar fix
Adds Requires and After for EntityManager
Also clean up dangling Requires that did not have After
Tested: On PSUSensor only
Signed-off-by: Josh Lehan <krellan@google.com>
Change-Id: Ib132b642b88dfb344b28d27d55dfd89b49e917f4
diff --git a/service_files/xyz.openbmc_project.adcsensor.service b/service_files/xyz.openbmc_project.adcsensor.service
index 536b318..6ca7049 100644
--- a/service_files/xyz.openbmc_project.adcsensor.service
+++ b/service_files/xyz.openbmc_project.adcsensor.service
@@ -2,6 +2,8 @@
Description=Adc Sensor
StopWhenUnneeded=false
Before=xyz.openbmc_project.cpusensor.service
+Requires=xyz.openbmc_project.EntityManager.service
+After=xyz.openbmc_project.EntityManager.service
[Service]
Restart=always
diff --git a/service_files/xyz.openbmc_project.cpusensor.service b/service_files/xyz.openbmc_project.cpusensor.service
index c51315d..31b7bbd 100644
--- a/service_files/xyz.openbmc_project.cpusensor.service
+++ b/service_files/xyz.openbmc_project.cpusensor.service
@@ -1,6 +1,8 @@
[Unit]
Description=CPU Sensor
StopWhenUnneeded=false
+Requires=xyz.openbmc_project.EntityManager.service
+After=xyz.openbmc_project.EntityManager.service
[Service]
Restart=always
diff --git a/service_files/xyz.openbmc_project.exitairsensor.service b/service_files/xyz.openbmc_project.exitairsensor.service
index 8049445..a799c5b 100644
--- a/service_files/xyz.openbmc_project.exitairsensor.service
+++ b/service_files/xyz.openbmc_project.exitairsensor.service
@@ -1,7 +1,10 @@
[Unit]
Description=Exit Air Temp Sensor
StopWhenUnneeded=false
+Requires=xyz.openbmc_project.Settings.service
After=xyz.openbmc_project.Settings.service
+Requires=xyz.openbmc_project.EntityManager.service
+After=xyz.openbmc_project.EntityManager.service
[Service]
Restart=always
diff --git a/service_files/xyz.openbmc_project.fansensor.service b/service_files/xyz.openbmc_project.fansensor.service
index 8e24781..f452ebf 100644
--- a/service_files/xyz.openbmc_project.fansensor.service
+++ b/service_files/xyz.openbmc_project.fansensor.service
@@ -1,6 +1,8 @@
[Unit]
Description=Fan Sensor
StopWhenUnneeded=false
+Requires=xyz.openbmc_project.EntityManager.service
+After=xyz.openbmc_project.EntityManager.service
[Service]
Restart=always
diff --git a/service_files/xyz.openbmc_project.hwmontempsensor.service b/service_files/xyz.openbmc_project.hwmontempsensor.service
index 4a75a6e..9513ac3 100644
--- a/service_files/xyz.openbmc_project.hwmontempsensor.service
+++ b/service_files/xyz.openbmc_project.hwmontempsensor.service
@@ -1,6 +1,8 @@
[Unit]
Description=Hwmon Temp Sensor
StopWhenUnneeded=false
+Requires=xyz.openbmc_project.EntityManager.service
+After=xyz.openbmc_project.EntityManager.service
[Service]
Restart=always
diff --git a/service_files/xyz.openbmc_project.intrusionsensor.service b/service_files/xyz.openbmc_project.intrusionsensor.service
index 5b407e4..1730b07 100644
--- a/service_files/xyz.openbmc_project.intrusionsensor.service
+++ b/service_files/xyz.openbmc_project.intrusionsensor.service
@@ -1,6 +1,8 @@
[Unit]
Description=Intrusion Sensor
StopWhenUnneeded=false
+Requires=xyz.openbmc_project.EntityManager.service
+After=xyz.openbmc_project.EntityManager.service
[Service]
Restart=always
diff --git a/service_files/xyz.openbmc_project.ipmbsensor.service b/service_files/xyz.openbmc_project.ipmbsensor.service
index af7d6f4..9f6805d 100644
--- a/service_files/xyz.openbmc_project.ipmbsensor.service
+++ b/service_files/xyz.openbmc_project.ipmbsensor.service
@@ -1,6 +1,8 @@
[Unit]
Description=IPMB Sensor
StopWhenUnneeded=false
+Requires=xyz.openbmc_project.EntityManager.service
+After=xyz.openbmc_project.EntityManager.service
[Service]
Restart=always
diff --git a/service_files/xyz.openbmc_project.mcutempsensor.service b/service_files/xyz.openbmc_project.mcutempsensor.service
index 33a98f2..d4d16e4 100644
--- a/service_files/xyz.openbmc_project.mcutempsensor.service
+++ b/service_files/xyz.openbmc_project.mcutempsensor.service
@@ -1,6 +1,8 @@
[Unit]
Description=MCU Temp Sensor
StopWhenUnneeded=false
+Requires=xyz.openbmc_project.EntityManager.service
+After=xyz.openbmc_project.EntityManager.service
[Service]
Restart=always
diff --git a/service_files/xyz.openbmc_project.psusensor.service b/service_files/xyz.openbmc_project.psusensor.service
index 02cdff2..4b22e8c 100644
--- a/service_files/xyz.openbmc_project.psusensor.service
+++ b/service_files/xyz.openbmc_project.psusensor.service
@@ -3,6 +3,7 @@
StopWhenUnneeded=false
Requires=xyz.openbmc_project.EntityManager.service
After=xyz.openbmc_project.EntityManager.service
+
[Service]
Restart=always
RestartSec=5