Author: mvidner Date: Thu Feb 17 16:28:45 2011 New Revision: 63440 URL: http://svn.opensuse.org/viewcvs/yast?rev=63440&view=rev Log: Fixed losing nameservers when doing a DVD installation (bnc#668034). r60729 which intended to fix bnc#561349 claims "write resolv.conf when change from dhcp->static" but in fact writes it always, even if there was no config at all, overwriting the DHCP nameservers with an empty list. Deleted that bit, bringing the patch closer to the original one of which it was a "backport", r41079 bnc#327074. Modified: branches/SuSE-SLE-10-SP4-Branch/network/VERSION branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/network/VERSION?rev=63440&r1=63439&r2=63440&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/network/VERSION Thu Feb 17 16:28:45 2011 @@ -1 +1 @@ -2.13.140 +2.13.141 Modified: branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes?rev=63440&r1=63439&r2=63440&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes Thu Feb 17 16:28:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 17 16:27:51 CET 2011 - mvidner@suse.cz + +- Fixed losing nameservers when doing a DVD installation (bnc#668034). +- 2.13.141 + +------------------------------------------------------------------- Tue Feb 1 13:05:46 CET 2011 - mvidner@suse.cz - Dropped ag_xauth (.xauth.key), superseded since 2005 by Modified: branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp?rev=63440&r1=63439&r2=63440&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp Thu Feb 17 16:28:45 2011 @@ -585,9 +585,6 @@ y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); NetworkService::StartStop (); y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); - DNS::modified=true; - DNS::Write(); - y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); sleep(sl); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org