summaryrefslogtreecommitdiffstats
path: root/activation.cpp
diff options
context:
space:
mode:
authorMichael Tritz <mtritz@us.ibm.com>2017-10-03 17:18:22 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-10-26 13:04:49 +0000
commit4254bece5f463a01508e9f9870e63998cd0fd5b5 (patch)
tree090d01f28d0f52fa948c62379483901f4104ca07 /activation.cpp
parentff0b421d3978666ad3c292e107055aa9a42327c9 (diff)
downloadphosphor-bmc-code-mgmt-4254bece5f463a01508e9f9870e63998cd0fd5b5.tar.gz
phosphor-bmc-code-mgmt-4254bece5f463a01508e9f9870e63998cd0fd5b5.zip
BMC Updater: Remove the Object.Delete interface from functional version
This commit enhances the functionality of the BMC software updater. Previously, each BMC version uploaded to the system would implement the Object.Delete D-Bus interface, including the version currently running on the BMC. In principle, this is a pretty major issue - at best, the Delete would do nothing to the current version but throw an error, and at worst, it could partially remove it and cause problems. This commit fixes that problem by moving the Delete implementation into a separate object for each activation and removing that interface for the current version. Resolves openbmc/openbmc#2335 Change-Id: I721b7455c9fb309ecbb50f807aaa44a16d51ba5a Signed-off-by: Michael Tritz <mtritz@us.ibm.com>
Diffstat (limited to 'activation.cpp')
-rw-r--r--activation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/activation.cpp b/activation.cpp
index ae8ebe9..1ed765c 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -38,9 +38,9 @@ void Activation::unsubscribeFromSystemdSignals()
return;
}
-void Activation::delete_()
+void Delete::delete_()
{
- parent.erase(versionId);
+ parent.parent.erase(parent.versionId);
}
auto Activation::activation(Activations value) ->
OpenPOWER on IntegriCloud