After that went in, it was noticed that a PowerRestoreDelay had been added to the xyz.openbmc_project.Control.Power.RestorePolicy interface. So instead of hard coding, lets set the 30s in our meta-ibm override for this property, and have the APR function just read that property to know how long to delay.
https://github.com/ibm-openbmc/phosphor-state-manager/commit/683013a7c19906ffd185bdca16963db5c35167cb went in recently to fix an issue with APR starting too early in the boot.
After that went in, it was noticed that a PowerRestoreDelay had been added to the xyz.openbmc_project.Control.Power.RestorePolicy interface. So instead of hard coding, lets set the 30s in our meta-ibm override for this property, and have the APR function just read that property to know how long to delay.
This should be upstreamable. So two things here: