Merge pull request #189 from yast/merge_SLE-15-GA

Merge SLE-15-GA into master
yast · Nov 12, 2018 · 116b06c · 116b06c
2 parents 91e7fe9 + 571430d
commit 116b06c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Nov 10 08:31:44 UTC 2018 - knut.anderssen@suse.com
+
+- Timezone: Since ntp-client does not write the config anymore when
+  called for syncing only, we need to remove the 'ntpdate_only'
+  parameter in order to continue proposing a default when it is
+  enabled in the control file (bsc#1108497).
+- 4.1.2
+
 -------------------------------------------------------------------
 Fri Nov  9 07:52:29 UTC 2018 - jsrain@suse.cz
 

diff --git a/package/yast2-country.spec b/package/yast2-country.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-country
-Version:        4.1.1
+Version:        4.1.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/timezone/src/include/timezone/dialogs.rb b/timezone/src/include/timezone/dialogs.rb
@@ -584,8 +584,7 @@ def TimezoneDialog(args)
         argmap = {
           "server"       => @ntp_server,
           # FIXME ntp-client_proposal doesn't understand 'servers' yet
-          "servers"      => servers,
-          "ntpdate_only" => true
+          "servers"      => servers
         }
 
         rv = Convert.to_symbol(ntp_call("Write", argmap))