Author: mvidner Date: Fri Nov 7 13:54:35 2008 New Revision: 53062 URL: http://svn.opensuse.org/viewcvs/yast?rev=53062&view=rev Log: Set a 15s timeout on one-time synchronization (bnc#442287). Modified: 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/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-clie... ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Fri Nov 7 13:54:35 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 7 13:54:27 CET 2008 - mvidner@suse.cz + +- Set a 15s timeout on one-time synchronization (bnc#442287). + +------------------------------------------------------------------- Thu Nov 6 18:31:20 CET 2008 - mvidner@suse.cz - Adjusted dialog buttons according to YaST Style Guide Modified: trunk/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev=... ============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Fri Nov 7 13:54:35 2008 @@ -919,14 +919,15 @@ // 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 %1", + "/usr/sbin/sntp -4 -c 1 -d 15 %1", server )); integer ret_IPv6 = 0; if (ret_IPv4 != 0) ret_IPv6 = (integer) SCR::Execute (.target.bash, sformat ( - "/usr/sbin/sntp -6 %1", + "/usr/sbin/sntp -6 -c 1 -d 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_proposa... ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Fri Nov 7 13:54:35 2008 @@ -215,7 +215,8 @@ // -r: do set the system time // -P no: do not ask if time difference is too large - integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/sntp -r -P no '%1'", String::Quote(ntp_server))); + // -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))); 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