Author: mvidner Date: Thu Dec 11 14:41:56 2008 New Revision: 54050 URL: http://svn.opensuse.org/viewcvs/yast?rev=54050&view=rev Log: At install time, do not overwrite the original ntp.conf but add our changes instead. Specifically netconfig needs the key config preserved (bnc#449615). Modified: trunk/ntp-client/VERSION trunk/ntp-client/package/yast2-ntp-client.changes trunk/ntp-client/src/ntp-client_finish.ycp Modified: trunk/ntp-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=54050&r1=54049&r2=54050&view=diff ============================================================================== --- trunk/ntp-client/VERSION (original) +++ trunk/ntp-client/VERSION Thu Dec 11 14:41:56 2008 @@ -1 +1 @@ -2.17.8 +2.17.9 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=54050&r1=54049&r2=54050&view=diff ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Thu Dec 11 14:41:56 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Dec 11 14:41:45 CET 2008 - mvidner@suse.cz + +- At install time, do not overwrite the original ntp.conf but add our + changes instead. Specifically netconfig needs the key config + preserved (bnc#449615). +- 2.17.9 + +------------------------------------------------------------------- Mon Dec 8 13:42:09 CET 2008 - kmachalkova@suse.cz - Missing strings marked for translation (bnc#446967, bnc#446969) Modified: trunk/ntp-client/src/ntp-client_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_finish.ycp?rev=54050&r1=54049&r2=54050&view=diff ============================================================================== --- trunk/ntp-client/src/ntp-client_finish.ycp (original) +++ trunk/ntp-client/src/ntp-client_finish.ycp Thu Dec 11 14:41:56 2008 @@ -36,11 +36,25 @@ } else if (func == "Write") { - map ex = NtpClient::Export(); + // bnc#449615, must merge the configs which Export/Import fails to do. + // User config from installation time: + // fortunately so far we only have the server address(es) + list<string> ss = NtpClient::GetUsedNtpServers(); + + // ntp.conf from the RPM NtpClient::Read(); - NtpClient::Import( ex ); + // put users server(s) back + foreach (string server, ss, { + // if not present, it adds it, + // otherwise it preserves what is there. uff what an API + integer idx = NtpClient::findSyncRecord("server", server); // -1: new + NtpClient::selectSyncRecord(idx); + NtpClient::selected_record["address"] = server; + NtpClient::selected_record["type"] = "server"; + NtpClient::storeSyncRecord(); + }); NtpClient::write_only = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org