packages/anaconda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cancel planned manual update of system time on turning ntp on

Browse Source
This commit is contained in:
bitcoffee 2021-11-28 23:31:29 +08:00
parent d9603a5bcc
commit 815bf34750
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
anaconda.spec
View File

@ -4,7 +4,7 @@
%endif
Name: anaconda
Version: 33.19
Release: 30
Release: 31
Summary: Graphical system installer
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -120,6 +120,8 @@ Patch6076: change-inst-repo-default-value.patch
Patch9026: support-use-sm3-crypt-user-password.patch
Patch6077: bugfix-Cancel-planned-manual-update-of-system-time-on-turni.patch
%define dbusver 1.2.3
%define dnfver 3.6.0
%define dracutver 034-7
@ -334,6 +336,12 @@ update-desktop-database &> /dev/null || :
%{_datadir}/gtk-doc
%changelog
* Sun Nov 28 2021 liuxin <liuxin350@huawei.com> - 33.19-31
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Cancel planned manual update of system time on turning ntp on
* Sat Oct 30 2021 liuxin <liuxin264@huawei.com> - 33.19-30
- Type:requirement
- ID:NA

40
bugfix-Cancel-planned-manual-update-of-system-time-on-turni.patch Normal file
View File

@ -0,0 +1,40 @@
From c21fd65251a0154e2816f1505910b9c99f0661be Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@redhat.com>
Date: Tue, 9 Nov 2021 09:33:45 +0100
Subject: [PATCH] Cancel planned manual update of system time on turning ntp on
The PR is based on a PR opened by bitcoffee who spotted the issue:
"If we do not cancel the timer, the time may be incorrectly changed by
the timer after the NTP service updates the time"
---
pyanaconda/ui/gui/spokes/datetime_spoke.py | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py
index 09deabb..8ebc5bb 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.py
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py
@@ -1059,8 +1059,22 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke):
def _show_no_ntp_server_warning(self):
self.set_warning(_("You have no working NTP server configured"))
+ def _cancel_planned_update(self):
+ """Cancel system time update planned by manual setting"""
+ # cancel system time update
+ if self._start_updating_timer:
+ self._start_updating_timer.cancel()
+ self._start_updating_timer = None
+ # re-enable UI update because it will not be done by the
+ # system time update we've just cancelled
+ if not self._update_datetime_timer:
+ self._update_datetime_timer = Timer()
+ self._update_datetime_timer.timeout_sec(1, self._update_datetime)
+
def on_ntp_switched(self, switch, *args):
if switch.get_active():
+ self._cancel_planned_update()
+
#turned ON
if not conf.system.can_set_time_synchronization:
#cannot touch runtime system, not much to do here