From 555f9f1c1e6b724fe7de468054b14b952bbcfb58 Mon Sep 17 00:00:00 2001 From: Raptor Engineering Development Team Date: Sun, 21 Jan 2018 06:41:07 -0600 Subject: Enable OCC service after IPL completion --- .../recipes-phosphor/occ/openpower-occ-control/occ-active.sh | 3 +++ .../occ/openpower-occ-control/op-occ-enable@.service | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'meta-openbmc-machines/meta-openpower') diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh index a6097e527..c005c7dd8 100755 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh @@ -14,6 +14,9 @@ fi OCC_CONTROL_SERVICE="org.open_power.OCC.Control" +# Rescan bus to find OCCs +openpower-proc-control scanFSI + busctl tree $OCC_CONTROL_SERVICE --list | grep occ | xargs -r -n1 -I{} \ busctl set-property $OCC_CONTROL_SERVICE {} org.open_power.OCC.Status \ OccActive b $value diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service index b97253cf0..2e969b8e8 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service @@ -4,14 +4,12 @@ Conflicts=obmc-host-stop@%i.target Conflicts=op-occ-disable@%i.service Wants=org.open_power.OCC.Control.service After=org.open_power.OCC.Control.service -Wants=fsi-scan@%i.service -After=fsi-scan@%i.service -ConditionPathExists=/run/openbmc/host@%i-on +Wants=obmc-host-ipl-complete@%i.target +After=obmc-host-ipl-complete@%i.target +ConditionPathExists=/run/openbmc/host@0-ipl-complete [Service] ExecStart=/usr/bin/env occ-active.sh enable SyslogIdentifier=occ-active.sh Type=oneshot -[Install] -WantedBy=obmc-host-start@%i.target -- cgit v1.2.1