summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2019-03-25 14:06:49 -0500
committerAdriana Kobylak <anoo@us.ibm.com>2019-03-25 15:51:46 -0500
commitdf7a6157b352ed251af7e3d7b7e4ef45f6f9e740 (patch)
tree1996f098a01c0b6f8d77dd48dd10b2baaa107eda
parent45c267a9aace7a29279140e3578207c7e4c86ae0 (diff)
downloadopenpower-pnor-code-mgmt-df7a6157b352ed251af7e3d7b7e4ef45f6f9e740.tar.gz
openpower-pnor-code-mgmt-df7a6157b352ed251af7e3d7b7e4ef45f6f9e740.zip
activation_ubi: Set priority in constructor
The base activation class sets the priority value in its constructor, but since the ubi class overrides this method, need to call it in the ubi constructor as well, otherwise the priority values won't get written to flash after a BMC factory reset, causing the pnor updater to think there are no pnor versions installed. Tested: After a BMC factory reset, the ubi priority() method was called, which restores the pnor priority files, and the pnor symlinks were created. Fixes: openbmc/openbmc#3507 Change-Id: I5d234ab232c91ac01d5c15c1c6ae87408c73b99c Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
-rw-r--r--ubi/activation_ubi.hpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/ubi/activation_ubi.hpp b/ubi/activation_ubi.hpp
index a17bb8263..c0ffa012d 100644
--- a/ubi/activation_ubi.hpp
+++ b/ubi/activation_ubi.hpp
@@ -12,7 +12,12 @@ namespace updater
class RedundancyPriorityUbi : public RedundancyPriority
{
public:
- using RedundancyPriority::RedundancyPriority;
+ RedundancyPriorityUbi(sdbusplus::bus::bus& bus, const std::string& path,
+ Activation& parent, uint8_t value) :
+ RedundancyPriority(bus, path, parent, value)
+ {
+ priority(value);
+ }
virtual ~RedundancyPriorityUbi() = default;
/** @brief Overloaded Priority property set function
OpenPOWER on IntegriCloud