Merge d55e81f into 48e72b6

yast · Aug 20, 2018 · f4e1777 · f4e1777
2 parents 48e72b6 + d55e81f
commit f4e1777
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/package/yast2-ntp-client.changes b/package/yast2-ntp-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 20 10:13:23 UTC 2018 - jreidinger@suse.com
+
+- Properly disable cron service when running systemd service when
+  called from Date and Time module (bsc#1102983)
+- 4.1.0
+
 -------------------------------------------------------------------
 Thu Apr 19 08:56:08 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2-ntp-client.spec b/package/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        4.0.12
+Version:        4.1.0
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0+

diff --git a/src/clients/ntp-client_proposal.rb b/src/clients/ntp-client_proposal.rb
@@ -307,8 +307,11 @@ def WriteNtpSettings(ntp_servers, ntp_server, run_service)
       ntp_servers.each do |server|
         NtpClient.ntp_conf.add_pool(server)
       end
-      NtpClient.run_service = run_service
-      if !run_service
+      if run_service
+        NtpClient.run_service = true
+        NtpClient.synchronize_time = false
+      else
+        NtpClient.run_service = false
         NtpClient.synchronize_time = true
         NtpClient.sync_interval = NtpClientClass::DEFAULT_SYNC_INTERVAL
       end