Author: varkoly Date: Wed Nov 10 15:20:40 2010 New Revision: 62804 URL: http://svn.opensuse.org/viewcvs/yast?rev=62804&view=rev Log: Merge with trunk for update Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/data/ntp_servers.ycp branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp branches/SuSE-Linux-11_3-Branch/ntp-client/src/ntp-client_proposal.ycp Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/data/ntp_servers.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-client/data/ntp_servers.ycp?rev=62804&r1=62803&r2=62804&view=diff ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/data/ntp_servers.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/data/ntp_servers.ycp Wed Nov 10 15:20:40 2010 @@ -46,15 +46,6 @@ "synchronization" : "xntpd (stratum 2), linux/unix", ], $[ - "access_policy" : "Open access to stratum 2 and stratum 3 NTP servers. Please, send a mail to notify.", - "address" : "ntp.cais.rnp.br", - "country" : "BR", - "exact_location" : "RNP - Brazilian Research Network/Rede Nacional de Pesquisa", - "location" : "Brazil", - "stratum" : "2", - "synchronization" : "NTP V4 Secondary (stratum 2), FreeBSD/UNIX", - ], - $[ "access_policy" : "Open access to stratum 3 server. Please, send a mail to notify.", "address" : "ntp.pop-pr.rnp.br", "country" : "BR", @@ -156,15 +147,6 @@ ], $[ "access_policy" : "open access", - "address" : "ntp.globe.cz", - "country" : "CZ", - "exact_location" : "Prague, The Czech Republic", - "location" : "Czech Republic", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), PC/Linux", - ], - $[ - "access_policy" : "open access", "address" : "ntp.karpo.cz", "country" : "CZ", "exact_location" : "Prague, The Czech Republic", @@ -174,15 +156,6 @@ ], $[ "access_policy" : "open access", - "address" : "ntp1.contactel.cz", - "country" : "CZ", - "exact_location" : "Prague, The Czech Republic", - "location" : "Czech Republic", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), PC/Linux", - ], - $[ - "access_policy" : "open access", "address" : "ntp2.contactel.cz", "country" : "CZ", "exact_location" : "Prague, The Czech Republic", @@ -191,13 +164,6 @@ "synchronization" : "NTP V4 secondary (stratum 2), PC/Linux", ], $[ - "address" : "tack.fh-augsburg.de", - "country" : "DE", - "exact_location" : "Augsburg University of Applied Sciences (FH), Augsburg, Bavaria, Germany", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), i486/Linux", - ], - $[ "address" : "tick.fh-augsburg.de", "country" : "DE", "exact_location" : "Augsburg University of Applied Sciences (FH), Augsburg, Bavaria, Germany", @@ -271,16 +237,6 @@ "synchronization" : "NTP V3 secondary (stratum 2), i686/FreeBSD", ], $[ - "access_policy" : "open access", - "address" : "ntp.cuhk.edu.hk", - "coordinates" : "22:25:10N, 114:12:22E", - "country" : "HK", - "exact_location" : "The Chinese University of Hong Kong.", - "location" : "Hong Kong, Taiwan, China, and South East Asia", - "stratum" : "2", - "synchronization" : "NTP V3 secondary (stratum 2), i686/Linux", - ], - $[ "access_policy" : "open access, glad to receive a note", "address" : "os.ntp.carnet.hr", "country" : "HR", @@ -344,22 +300,6 @@ "synchronization" : "NTPV4 secondary (stratum 2), Intel, FreeBSD 2.2", ], $[ - "address" : "ntps.net4u.it", - "country" : "IT", - "exact_location" : "4u Srl, Vercelli, Italy", - "stratum" : "2", - "synchronization" : "NTP secondary (stratum 2), Linux 2 on Intel PIII 500MHz", - ], - $[ - "access_policy" : "open access", - "address" : "ntp.doubleukay.com", - "country" : "MY", - "exact_location" : "Cyberjaya, Malaysia", - "location" : "Malaysia", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), Intel/Linux", - ], - $[ "access_policy" : "open access", "address" : "fartein.ifi.uio.no", "coordinates" : "59:56:32N, 10:43:22E", @@ -485,7 +425,7 @@ $[ "access_policy" : "open access", "address" : "a.ntp.alphazed.net", - "country" : "UK", + "country" : "GB", "exact_location" : "Telehouse, London E14", "location" : "all areas", "stratum" : "2", @@ -501,18 +441,10 @@ "synchronization" : "NTP V4 Secondary (stratum 2), Sun SPARC10/Solaris,", ], $[ - "access_policy" : "Open Access", - "address" : "bear.zoo.bt.co.uk", - "country" : "UK", - "exact_location" : "BT Adastral Park, Ipswich, England", - "location" : "UK", - "stratum" : "2", - ], - $[ "access_policy" : "open access", "address" : "ntp.cis.strath.ac.uk", "coordinates" : "04:14W, 55:52N", - "country" : "UK", + "country" : "GB", "exact_location" : "Dept. Computer and Information Sciences, University of Strathclyde, Glasgow, Scotland.", "location" : "UK/Europe", "stratum" : "2", @@ -521,49 +453,49 @@ $[ "access_policy" : "Open Access", "address" : "ntp2a.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), Sun/SunOS", ], $[ "access_policy" : "Open Access", "address" : "ntp2b.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), PC/FreeBSD", ], $[ "access_policy" : "Open Access", "address" : "ntp2c.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), PC/FreeBSD", ], $[ "access_policy" : "Open Access", "address" : "ntp2d.mcc.ac.uk", - "country" : "UK", + "country" : "GB", "exact_location" : "University of Manchester, Manchester, England", - "location" : "UK", + "location" : "GB", "stratum" : "2", "synchronization" : "NTP secondary (S2), SGI/Irix", ], $[ "address" : "ntp", - "country" : "UK", + "country" : "GB", "exact_location" : "Telehouse Europe, London E14.Geographic Coordinates: 51°30.71'N 0°00.08'W", "stratum" : "2", ], $[ "access_policy" : "Semi-open access. These are primarily for use by UUNET customers who may use them without asking, but others are welcome to peer if they give notice.", "address" : "ntp0.uk.uu.net", - "country" : "UK", + "country" : "GB", "exact_location" : "Cambridge, UK", "location" : "UUNET (formerly known in the UK as PIPEX); UK", "stratum" : "2", @@ -571,7 +503,7 @@ $[ "access_policy" : "Semi-open access. These are primarily for use by UUNET customers who may use them without asking, but others are welcome to peer if they give notice.", "address" : "ntp1.uk.uu.net", - "country" : "UK", + "country" : "GB", "exact_location" : "Cambridge, UK", "location" : "UUNET (formerly known in the UK as PIPEX); UK", "stratum" : "2", @@ -579,7 +511,7 @@ $[ "access_policy" : "Semi-open access. These are primarily for use by UUNET customers who may use them without asking, but others are welcome to peer if they give notice.", "address" : "ntp2.uk.uu.net", - "country" : "UK", + "country" : "GB", "exact_location" : "London, UK", "location" : "UUNET (formerly known in the UK as PIPEX); UK", "stratum" : "2", @@ -615,17 +547,6 @@ "synchronization" : "NTP secondary (stratum 2)", ], $[ - "access_policy" : "Open Access, please drop us a note so we can add you to our mailing list.", - "address" : "ntp1.mainecoon.com", - "coordinates" : "39:56.863N, 120:54.657W", - "country" : "US", - "exact_location" : "Quincy, California", - "location" : "North America", - "state" : "CA ", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2) P-II/X86 Solaris 2.7", - ], - $[ "access_policy" : "open access, please send a message to notify", "address" : "ntp1.sf-bay.org", "country" : "US", @@ -781,16 +702,6 @@ "synchronization" : "NTP V3 secondary (stratum 2), Linux on Intel", ], $[ - "access_policy" : "open access", - "address" : "ntp.ourconcord.net", - "country" : "US", - "exact_location" : "Concord, MA", - "location" : "Eastern time zone", - "state" : "MA ", - "stratum" : "2", - "synchronization" : "NTP v4 stratum 2, Linux", - ], - $[ "access_policy" : "open access, please send a message to notify.", "address" : "ns.nts.umn.edu", "country" : "US", @@ -914,17 +825,6 @@ "synchronization" : "NTP secondary (stratum 2), Sun/Unix", ], $[ - "access_policy" : "open access", - "address" : "reva.sixgirls.org", - "coordinates" : "40:42:20N, 74:0:40W", - "country" : "US", - "exact_location" : "The NYITC Building, 55 Broad Street, New York City, NY", - "location" : "New York, New Jersey, Connecticut, Long Island areas", - "state" : "NY ", - "stratum" : "2", - "synchronization" : "NTP V4 secondary (stratum 2), m68k/NetBSD", - ], - $[ "access_policy" : "open access; please use name rather than address.", "address" : "sundial.columbia.edu", "country" : "US", @@ -1106,31 +1006,6 @@ "synchronization" : "NTP V4 secondary Solaris 2.7", ], $[ - "address" : "ntp.cs.unp.ac.za", - "country" : "ZA", - "exact_location" : "Natal University, Pietermaritzburg, South Africa", - "stratum" : "2", - "synchronization" : "NTP V3 secondary (stratum 2), SGI Indy/Irix6.2", - ], - $[ - "access_policy" : "open access", - "address" : "tock.nml.csir.co.za", - "coordinates" : "25,7461 S 28,2770 E (WGS-84)", - "country" : "ZA", - "exact_location" : "Pretoria, South Africa", - "location" : "Southern Africa", - "stratum" : "2", - "synchronization" : "NTP secondary (stratum 2), i386/FreeBSD", - ], - $[ - "address" : "ntp0.coreng.com.au", - "coordinates" : "33:50S 151:09E", - "country" : "AU", - "exact_location" : "Corinthian Engineering P/L, Sydney Australia.", - "stratum" : "1", - "synchronization" : "NTP V4 primary (Trimble Acutime GPS+PPS), i386/FreeBSD 4-STABLE.", - ], - $[ "address" : "ntp0.cs.mu.OZ.AU", "coordinates" : "37:48:09.60S 144:57:29.50E", "country" : "AU", @@ -1158,26 +1033,6 @@ "synchronization" : "NTP V4 Primary (GPS clock), PC/FreeBSD", ], $[ - "access_policy" : "open access, prior arrangment required", - "address" : "tick.usask.ca", - "coordinates" : "52:08:01N,106:38:11W", - "country" : "CA", - "exact_location" : "University oc Saskatchewan, Saskatoon, Saskatchewan, SK, Canada", - "location" : "SASK#net, CA*net, Canada", - "stratum" : "1", - "synchronization" : "NTP V3 Primary (GOES clock), DEC Mips/Unix", - ], - $[ - "access_policy" : "open access, prior arrangment required", - "address" : "tock.usask.ca", - "coordinates" : "52:08:01N,106:38:11W", - "country" : "CA", - "exact_location" : "University oc Saskatchewan, Saskatoon, Saskatchewan, SK, Canada", - "location" : "SASK#net, CA*net, Canada", - "stratum" : "1", - "synchronization" : "NTP V3 Primary (GOES clock), DEC Mips/Unix", - ], - $[ "access_policy" : "open access, please send a message to notify", "address" : "ntp.metas.ch", "coordinates" : "N 46:55:25 E 07:27:51", @@ -1288,27 +1143,6 @@ "synchronization" : "NTP V3 primary (GPS), PC/Linux", ], $[ - "address" : "ntp1.curie.fr", - "country" : "FR", - "exact_location" : "Institut Curie, Section de Recherche, Paris, France.", - "stratum" : "1", - "synchronization" : "Coetanian TSS100 NTP V3 GPS", - ], - $[ - "address" : "ntp2.curie.fr", - "country" : "FR", - "exact_location" : "Institut Curie, Section de Recherche, Paris, France.", - "stratum" : "1", - "synchronization" : "Datum 2100L NTP V3 GPS", - ], - $[ - "address" : "ntp3.curie.fr", - "country" : "FR", - "exact_location" : "Institut Curie, Section de Recherche, Paris, France.", - "stratum" : "1", - "synchronization" : "Truetime NTS100 GPS", - ], - $[ "access_policy" : "open access, please send a message to notify", "address" : "ntp-galway.hea.net", "country" : "IE", @@ -1527,7 +1361,7 @@ $[ "access_policy" : "closed access, see notes below.", "address" : "ntp2.ja.net", - "country" : "UK", + "country" : "GB", "exact_location" : "University of London Computer Centre, UK", "location" : "JANET", "stratum" : "1", @@ -1613,17 +1447,6 @@ "synchronization" : "NTP V3 primary GPS Clock", ], $[ - "access_policy" : "Open to stratum 2 servers for 10 or more hosts, others upon request", - "address" : "tick.gpsclock.com", - "coordinates" : "33:50:26.510N, 118:22:55.245W", - "country" : "US", - "exact_location" : "GPSClock.com headquarters, Redondo Beach, CA", - "location" : "US Pacific, Los Angeles area", - "state" : "CA ", - "stratum" : "1", - "synchronization" : "NTP V4 primary, GPSClock 300 hard PPS, FreeBSD", - ], - $[ "address" : "tick.ucla.edu", "country" : "US", "exact_location" : "UCLA, Los Angeles, CA", @@ -1732,17 +1555,6 @@ ], $[ "access_policy" : "closed access, except for stratum-2 servers providing synchronization to local networks of ten or more hosts", - "address" : "ntp1.nss.udel.edu", - "coordinates" : "39:40:35.8N, 75:44:36.6W (GPS WGS 84)", - "country" : "US", - "exact_location" : "University of Delaware, Newark, DE", - "location" : "BBN Planet SER", - "state" : "DE ", - "stratum" : "1", - "synchronization" : "NTP V3 Primary (GPS clock), TrueTime NTS-100-GPS", - ], - $[ - "access_policy" : "closed access, except for stratum-2 servers providing synchronization to local networks of ten or more hosts", "address" : "rackety.udel.edu", "coordinates" : "39:40:48.425N, 75:45:02.392W (GPS WGS84)", "country" : "US", @@ -1801,16 +1613,6 @@ "synchronization" : "NTP V3 primary (Brandywine Syncclock32/Oncore GPS)", ], $[ - "access_policy" : "closed access except for peers that meet the three conditions outlined in the "Time Servers" section of this file. State agreement with those conditions in notification message. All others may use the ntp-{0,1,2}.cso.uiuc.edu stratum 2 servers.", - "address" : "truechimer.cso.uiuc.edu", - "country" : "US", - "exact_location" : "University of Illinois, Urbana-Champaign, IL", - "location" : "CICNET, Midwest, NCSA region", - "state" : "IL ", - "stratum" : "1", - "synchronization" : "NTP V3 primary (WWVB clock), IBM-RS6000/250", - ], - $[ "access_policy" : "open access to significant stratum 2 servers in the service areas.", "address" : "tick.cerias.purdue.edu", "coordinates" : "40:25:33.2N, 86:54:54.7W (GPS)", @@ -1851,16 +1653,6 @@ "synchronization" : "NTP V4 primary, Motorola Oncore VP GPS, Linux", ], $[ - "access_policy" : "open access to stratum-2 servers and to MIT clients", - "address" : "tick.mit.edu", - "country" : "US", - "exact_location" : "Massachusetts Institute of Technology, Cambridge, MA", - "location" : "eastern time zone, others on request", - "state" : "MA ", - "stratum" : "1", - "synchronization" : "NTP V3 primary (GPS) HP9000/747i", - ], - $[ "access_policy" : "open access", "address" : "time.keneli.org", "country" : "US", @@ -1901,15 +1693,6 @@ "synchronization" : "NTP V3 primary (GPS) HP9000/747i", ], $[ - "access_policy" : "NC-REN region, other use by prior arrangement", - "address" : "ncnoc.ncren.net", - "country" : "US", - "exact_location" : "MCNC, Research Triangle Park, NC", - "state" : "NC ", - "stratum" : "1", - "synchronization" : "NTP V3 primary (WWVB clock), Netclock/2, Sun 4/65", - ], - $[ "access_policy" : "Closed access, except for stratum-2 servers providing synchronization to local networks of ten or more hosts; others by arrangement only. Please send a message to notify.", "address" : "ntp0.jensenresearch.com", "coordinates" : "41 00.975 N, 74 15.262 W<br>Synchronization: NTP V4 primary; Præcis Ct CDMA clock; Intel PIII/866 Win2K", Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes?rev=62804&r1=62803&r2=62804&view=diff ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/package/yast2-ntp-client.changes Wed Nov 10 15:20:40 2010 @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Wed Nov 10 15:11:04 CEST 2010 - varkoly@novell.com + +- bnc#619782 Time zone configuration during initial installation. + +------------------------------------------------------------------- +Wed Apr 21 16:39:38 CEST 2010 - varkoly@suse.de + +- Remove missleading depracated input field + +------------------------------------------------------------------- +Thu Sep 2 11:21:09 CEST 2010 - jsuchome@suse.cz + +- provide public API for info about time synchronization without + daemon running (bnc#627818) +- 2.20.0 + +------------------------------------------------------------------- Fri Apr 9 15:24:42 UTC 2010 - varkoly@novell.com - Initial version of time synchronization without running ntp as deamon Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp?rev=62804&r1=62803&r2=62804&view=diff ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/src/NtpClient.ycp Wed Nov 10 15:20:40 2010 @@ -216,8 +216,14 @@ } map MakePoolRecord (string CC, string location) { + string mycc = tolower(CC); + //There is no gb.pool.ntp.org only uk.pool.ntp.org + if ( mycc == "gb" ) + { + mycc="uk"; + } return $[ - "address" : tolower(CC) + ".pool.ntp.org", + "address" : mycc + ".pool.ntp.org", "country" : CC, "location": location, ]; @@ -434,6 +440,28 @@ } /** + * Read the synchronization status, fill + * synchronize_time and sync_interval variables + * Return updated value of synchronize_time + */ +global boolean ReadSynchronization () { + + list crontab = (list)SCR::Read(.cron, cron_file, ""); + y2milestone("CRONTAB %1", crontab); + string tmp = (string) crontab[0,"events",0,"active"]:"0"; + synchronize_time = tmp == "1"; + tmp = (string) crontab[0,"events",0,"minute"]:"*/5"; + y2milestone("MINUTE %1", tmp); + list pos = regexppos(tmp, "[0-9]+"); + string tmp2 = substring(tmp,pos[0]:0,pos[1]:0); + sync_interval = tointeger(tmp2); + y2milestone("SYNC_INTERVAL %1", sync_interval); + + return synchronize_time; +} + + +/** * Read all ntp-client settings * @return true on success */ @@ -518,16 +546,8 @@ if (! Mode::commandline() && ! FileChanges::CheckFiles (["/etc/ntp.conf"])) failed = true; ProcessNtpConf(); - list crontab = (list)SCR::Read(.cron, cron_file, ""); - y2milestone("CRONTAB %1", crontab); - string tmp = (string) crontab[0,"events",0,"active"]:"0"; - synchronize_time = tmp == "1"; - tmp = (string) crontab[0,"events",0,"minute"]:"*/5"; - y2milestone("MINUTE %1", tmp); - list pos = regexppos(tmp, "[0-9]+"); - string tmp2 = substring(tmp,pos[0]:0,pos[1]:0); - sync_interval = tointeger(tmp2); - y2milestone("SYNC_INTERVAL %1", sync_interval); + + ReadSynchronization (); string run_chroot_s = (string) SCR::Read (.sysconfig.ntp.NTPD_RUN_CHROOTED); run_chroot = run_chroot_s == "yes"; Modified: branches/SuSE-Linux-11_3-Branch/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ntp-client/src/ntp-client_proposal.ycp?rev=62804&r1=62803&r2=62804&view=diff ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ntp-client/src/ntp-client_proposal.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ntp-client/src/ntp-client_proposal.ycp Wed Nov 10 15:20:40 2010 @@ -77,7 +77,11 @@ } boolean GetNTPEnabled () { - return Service::Enabled (NtpClient::service_name); + + if (!Stage::initial()) + NtpClient::ReadSynchronization (); + + return NtpClient::synchronize_time || Service::Enabled (NtpClient::service_name); } boolean ValidateSingleServer( string ntp_server ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org