summaryrefslogtreecommitdiffstats
path: root/app/configuration/controllers
diff options
context:
space:
mode:
authorGunnar Mills <gmills@us.ibm.com>2018-09-27 08:53:07 -0500
committerGunnar Mills <gmills@us.ibm.com>2018-10-09 00:42:39 +0000
commitf378c772cfeef5cf40679307db1807622a0aaa4e (patch)
tree390ff70111da551c07ea7ac00911c961a11a4e88 /app/configuration/controllers
parent282a8ec32a99a469249aef53253e09f050e0826a (diff)
downloadphosphor-webui-f378c772cfeef5cf40679307db1807622a0aaa4e.tar.gz
phosphor-webui-f378c772cfeef5cf40679307db1807622a0aaa4e.zip
Set the Host Time if "Split" and "NTP"
From: https://github.com/openbmc/phosphor-time-manager Mode Owner Set BMC Time Set Host Time NTP SPLIT Fail to set OK Resolves openbmc/phosphor-webui#19 Change-Id: I72f5617581533a2bb17d415b45bdf7ec6372ecab Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'app/configuration/controllers')
-rw-r--r--app/configuration/controllers/date-time-controller.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/configuration/controllers/date-time-controller.js b/app/configuration/controllers/date-time-controller.js
index 5a1f8d2..c5a3e8b 100644
--- a/app/configuration/controllers/date-time-controller.js
+++ b/app/configuration/controllers/date-time-controller.js
@@ -101,11 +101,15 @@ window.angular && (function(angular) {
manual_promises.push(setBMCTime());
}
- if ($scope.time_owner == 'Host' ||
- $scope.time_owner == 'Split') {
+ if ($scope.time_owner == 'Host') {
manual_promises.push(setHostTime());
}
}
+ // Set the Host if Split even if NTP.
+ if ($scope.time_owner == 'Split') {
+ manual_promises.push(setHostTime());
+ }
+
$q.all(manual_promises)
.then(
function() {
OpenPOWER on IntegriCloud