Merge pull request #187 from yast/bnc_960059

Bnc 960059
yast · Jan 20, 2016 · b1d2093 · b1d2093
2 parents 135f62f + 1ae3bf9
commit b1d2093
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 20 10:12:35 CET 2016 - schubi@suse.de
+
+- Adapting sntp call to new API (version 4.2.8).
+  (bnc#960059)
+- 3.1.101.12
+
 -------------------------------------------------------------------
 Tue Jan 19 15:19:04 CET 2016 - schubi@suse.de
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.101.11
+Version:        3.1.101.12
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -58,6 +58,7 @@ Requires:       yast2-storage >= 3.1.59
 Requires:       yast2-transfer >= 2.21.0
 Requires:       yast2-xml
 Conflicts:      yast2-installation < 3.1.158
+Conflicts:      ntp < 4.2.8
 
 Provides:       yast2-config-autoinst
 Provides:       yast2-module-autoinst

diff --git a/src/modules/AutoinstGeneral.rb b/src/modules/AutoinstGeneral.rb
@@ -420,7 +420,7 @@ def NtpSync
           # TRANSLATORS: %s is the name of the ntp server
           _("Syncing time with %s.") % ntp_server
         )
-        ret = SCR.Execute(path(".target.bash"), "/usr/sbin/sntp -t 2 -s #{ntp_server}")
+        ret = SCR.Execute(path(".target.bash"), "/usr/sbin/sntp -t 2 -S #{ntp_server}")
         if ret > 0
           Report.Error(_("Time syncing failed."))
         else

diff --git a/test/AutoinstGeneral_test.rb b/test/AutoinstGeneral_test.rb
@@ -18,7 +18,7 @@
 
       expect(Yast::SCR).to receive(:Execute).with(
         path(".target.bash"),
-        "/usr/sbin/sntp -t 2 -s #{Yast::AutoinstGeneral.mode["ntp_sync_time_before_installation"]}").and_return(0)
+        "/usr/sbin/sntp -t 2 -S #{Yast::AutoinstGeneral.mode["ntp_sync_time_before_installation"]}").and_return(0)
       expect(Yast::SCR).to receive(:Execute).with(
         path(".target.bash"),"/sbin/hwclock --systohc").and_return(0)