summaryrefslogtreecommitdiff
path: root/units
diff options
authorPMR <pmr@pmr-lander>2020-04-20 14:42:47 +0000
committerPMR <pmr@pmr-lander>2020-04-20 14:42:47 +0000
commit4be2fe978ae9af08b14462324306be3f0a5dc123 (patch)
tree5366ee8aa9ec46762afa9cbac5fea4a0f09c146b /units
parent2c9a28977a4aa15e179ee171746c485d221753fe (diff)
parent75f6063b08b453046179e7801ea4a72f04b81f68 (diff)
Merge #382501 from ~bladernr/plainbox-provider-checkbox:1873464-fix-nvdimm-health
Fix nvdimm/health to work for both version 1 and 2 of ipmctl
Diffstat (limited to 'units')
-rw-r--r--units/nvdimm/jobs.pxu4
1 files changed, 3 insertions, 1 deletions
diff --git a/units/nvdimm/jobs.pxu b/units/nvdimm/jobs.pxu
index 6db1b66..b663e52 100644
--- a/units/nvdimm/jobs.pxu
+++ b/units/nvdimm/jobs.pxu
@@ -6,6 +6,7 @@ user: root
requires:
executable.name == "ipmctl"
lsb.release >= "18.04"
+ nvdimm_resource.detected == "true"
command: ipmctl show -dimm
_summary:
Verify that NVDIMMs are discovered
@@ -20,7 +21,8 @@ user: root
requires:
executable.name == "ipmctl"
lsb.release >= "18.04"
-command: ipmctl show -d CurrentValue,CurrentState -sensor Health
+ nvdimm_resource.detected == "true"
+command: ipmctl show -sensor Health
_summary:
Report health state of installed NVDIMM devices
_description: