diff options
| author | Thomaiyar, Richard Marian <richard.marian.thomaiyar@intel.com> | 2019-10-08 19:04:25 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2019-10-08 19:04:25 +0300 |
| commit | 7998edd927c3370719a9ea9f70f55773c0964604 (patch) | |
| tree | 8307f5e9173c237c7622b8705c987053b8f5289b | |
| parent | 8cdd843642bcd4ba88e0d10417c91ff24d226de2 (diff) | |
| parent | 4df5ac748848c0cc9b8035bb9deceb790af3b971 (diff) | |
| download | provingground-7998edd927c3370719a9ea9f70f55773c0964604.tar.xz | |
Merge "prov-mode: Remove throwing error from prov mode."
| -rw-r--r-- | prov-mode-mgr/src/prov-mode-mgr.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/prov-mode-mgr/src/prov-mode-mgr.cpp b/prov-mode-mgr/src/prov-mode-mgr.cpp index c6c3315..33d084a 100644 --- a/prov-mode-mgr/src/prov-mode-mgr.cpp +++ b/prov-mode-mgr/src/prov-mode-mgr.cpp @@ -36,8 +36,9 @@ ProvModeMgr::ProvModeMgr( phosphor::logging::log<phosphor::logging::level::ERR>( "Error in querying provision mode", phosphor::logging::entry("MSG=%s", ec.message().c_str())); - phosphor::logging::elog<sdbusplus::xyz::openbmc_project:: - Common::Error::InternalFailure>(); + provMode = + secCtrl::RestrictionMode::Modes::ProvisionedHostDisabled; + // Fall through - Continue with ProvisionedHostDisabled value. } if (modeStr.empty()) { @@ -65,8 +66,7 @@ void ProvModeMgr::updateProvModeProperty( phosphor::logging::log<phosphor::logging::level::ERR>( "RestrictionMode set-property failed", phosphor::logging::entry("MSG=%s", ec.message().c_str())); - phosphor::logging::elog<sdbusplus::xyz::openbmc_project:: - Common::Error::InternalFailure>(); + // Continue, even for u-boot param update failure. } }, uBootEnvMgrService, uBootEnvMgrPath, uBootEnvMgrIntf, @@ -101,9 +101,7 @@ void ProvModeMgr::init() phosphor::logging::log<phosphor::logging::level::ERR>( "RestrictionMode set-property failed", phosphor::logging::entry("Mode=%s", req.c_str()), - phosphor::logging::entry("EXCEPTION:%s", e.what())); - phosphor::logging::elog<sdbusplus::xyz::openbmc_project:: - Common::Error::InternalFailure>(); + phosphor::logging::entry("EXCEPTION=%s", e.what())); } return 0; }, |