Author: mzugec Date: Wed Oct 27 13:55:09 2010 New Revision: 62691 URL: http://svn.opensuse.org/viewcvs/yast?rev=62691&view=rev Log: AY: when no network profile, don't change network configuration (bnc#649494) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Routing.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62691&r1=62690&r2=62691&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Oct 27 13:55:09 2010 @@ -1 +1 @@ -2.19.40 +2.19.41 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62691&r1=62690&r2=62691&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Oct 27 13:55:09 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 27 13:53:54 CEST 2010 - mzugec@suse.cz + +- AY: when no network profile, don't change network configuration +(bnc#649494) +- 2.19.41 + +------------------------------------------------------------------- Tue Oct 26 14:44:47 CEST 2010 - mzugec@suse.cz - added "No IP" option for bridge devices (bnc#648620) Modified: trunk/network/src/modules/Routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Routing.ycp?rev=62691&r1=62690&r2=62691&view=diff ============================================================================== --- trunk/network/src/modules/Routing.ycp (original) +++ trunk/network/src/modules/Routing.ycp Wed Oct 27 13:55:09 2010 @@ -30,6 +30,8 @@ */ global list<map> Routes = []; +// modified by AY (bnc#649494) +boolean modified = nil; /** * Enable IP forwarding * .sysconfig.sysctl.IP_FORWARD @@ -58,6 +60,8 @@ */ global define boolean Modified() { boolean ret = (Routes != Orig_Routes || Forward != Orig_Forward); + // probably called without Read() (bnc#649494) + if (Orig_Routes==nil && Orig_Forward==nil && modified!=true) ret = false; y2debug("ret=%1", ret); return ret; } @@ -226,6 +230,8 @@ Orig_Routes = nil; Orig_Forward = nil; + modified=true; + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org