Revert "Factory Reset: Wait for env variables"
This reverts commit 60f5ccfd5ab0fc8cedc3a2bf5f5adcab77318b7d.
There's no need to sleep in order to wait for the systemd
service file to hopefully finish. The factory reset helper
functions now executes in a child process and are waited on.
Tested: Added debug log messages to verify that the reset
function returned until the environment variable
was set.
Change-Id: I22a137c9440c9e971d9606c5efca3fc14d44c3eb
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/item_updater.cpp b/item_updater.cpp
index e6dd298..d831217 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -18,7 +18,6 @@
#include <queue>
#include <set>
#include <string>
-#include <thread>
namespace phosphor
{
@@ -485,13 +484,8 @@
void ItemUpdater::reset()
{
- constexpr auto setFactoryResetWait = std::chrono::seconds(3);
helper.factoryReset();
- // Need to wait for env variables to complete, otherwise an immediate reboot
- // will not factory reset.
- std::this_thread::sleep_for(setFactoryResetWait);
-
log<level::INFO>("BMC factory reset will take effect upon reboot.");
}