diff options
| author | Yoshie Muranaka <yoshiemuranaka@gmail.com> | 2019-11-11 07:44:33 -0800 |
|---|---|---|
| committer | Gunnar Mills <gmills@us.ibm.com> | 2019-11-14 01:48:02 +0000 |
| commit | c10fce5b9497eea5ff36160adf0497c62b53a549 (patch) | |
| tree | 273f8a2bbe9d497e716a88ead251f3403f741345 /app | |
| parent | f5e9de032f44ffdd7613986eb8093867c6af5283 (diff) | |
| download | phosphor-webui-c10fce5b9497eea5ff36160adf0497c62b53a549.tar.gz phosphor-webui-c10fce5b9497eea5ff36160adf0497c62b53a549.zip | |
Remove firmware reboot timeout
A 10 second timeout was used as a tempoary work-around
before rebooting the BMC on the firmware page–removing
the timeout since it is no longer needed.
Signed-off-by: Yoshie Muranaka <yoshiemuranaka@gmail.com>
Change-Id: I6a95d5f5bb377d3fd3cc0802f7fb3d6d0f177870
Diffstat (limited to 'app')
| -rw-r--r-- | app/configuration/controllers/firmware-controller.js | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/app/configuration/controllers/firmware-controller.js b/app/configuration/controllers/firmware-controller.js index 89cf9c6..451c16c 100644 --- a/app/configuration/controllers/firmware-controller.js +++ b/app/configuration/controllers/firmware-controller.js @@ -116,26 +116,14 @@ window.angular && (function(angular) { .then(function(state) { if ($scope.activate.reboot && ($scope.activate_image_type == 'BMC')) { - // Despite the new image being active, issue, - // https://github.com/openbmc/openbmc/issues/2764, can - // cause a system to brick, if the system reboots before - // the service to set the U-Boot variables is complete. - // Wait 10 seconds before rebooting to ensure this service - // is complete. This issue is fixed in newer images, but - // the user may be updating from an older image that does - // not that have this fix. - // TODO: remove this timeout after sufficient time has - // passed. - $timeout(function() { - APIUtils.bmcReboot().then( - function(response) { - toastService.success('BMC is rebooting.') - }, - function(error) { - console.log(JSON.stringify(error)); - toastService.error('Unable to reboot BMC.'); - }); - }, 10000); + APIUtils.bmcReboot().then( + function(response) { + toastService.success('BMC is rebooting.') + }, + function(error) { + console.log(JSON.stringify(error)); + toastService.error('Unable to reboot BMC.'); + }); } if ($scope.activate.reboot && ($scope.activate_image_type == 'Host')) { |
