Author: mvidner Date: Thu Feb 3 17:03:12 2011 New Revision: 63337 URL: http://svn.opensuse.org/viewcvs/yast?rev=63337&view=rev Log: Fixed one-time setting and testing by adjusting to the changed sntp syntax (bnc#661865). Modified: trunk/ntp-client/VERSION trunk/ntp-client/package/yast2-ntp-client.changes trunk/ntp-client/src/NtpClient.ycp trunk/ntp-client/src/ntp-client_proposal.ycp Modified: trunk/ntp-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=63337&r1=63336&r2=63337&view=diff ============================================================================== --- trunk/ntp-client/VERSION (original) +++ trunk/ntp-client/VERSION Thu Feb 3 17:03:12 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-client.changes?rev=63337&r1=63336&r2=63337&view=diff ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Thu Feb 3 17:03:12 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 3 17:02:54 CET 2011 - mvidner@suse.cz + +- Fixed one-time setting and testing by adjusting to the changed sntp + syntax (bnc#661865). +- 2.20.2 + +------------------------------------------------------------------- Fri Nov 12 08:38:53 CEST 2010 - varkoly@novell.com - bnc#650879 - Missing newline makes /etc/cron.d/novell.ntp-synchronize not work Modified: trunk/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev=63337&r1=63336&r2=63337&view=diff ============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Thu Feb 3 17:03:12 2011 @@ -996,15 +996,14 @@ // testing the server using IPv4 and then using IPv6 protocol // bug #74076, Firewall could have been blocked IPv6 - // -c 1 -d 15: delay 15s, only one try (bnc#442287) integer ret_IPv4 = (integer) SCR::Execute (.target.bash, sformat ( - "/usr/sbin/sntp -4 -c 1 -d 15 %1", + "/usr/sbin/sntp -4 -t 15 %1", server )); integer ret_IPv6 = 0; if (ret_IPv4 != 0) ret_IPv6 = (integer) SCR::Execute (.target.bash, sformat ( - "/usr/sbin/sntp -6 -c 1 -d 15 %1", + "/usr/sbin/sntp -6 -t 15 %1", server )); Modified: trunk/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_proposal.ycp?rev=63337&r1=63336&r2=63337&view=diff ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Thu Feb 3 17:03:12 2011 @@ -312,10 +312,9 @@ y2milestone("Running sntp to sync with %1", ntp_server); - // -r: do set the system time - // -P no: do not ask if time difference is too large - // -c 1 -d 15: delay 15s, only one try (bnc#442287) - integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/sntp -c 1 -d 15 -r -P no '%1'", String::Quote(ntp_server))); + // -s: do set the system time + // -t 15: timeout 15s per one of 5 tries + integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/sntp -t 15 -s '%1'", String::Quote(ntp_server))); y2milestone ("'sntp %1' returned %2", ntp_server, r); Popup::ClearFeedback(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org