Author: mvidner Date: Fri Sep 2 16:11:42 2011 New Revision: 65520 URL: http://svn.opensuse.org/viewcvs/yast?rev=65520&view=rev Log: Don't switch bonding interfaces to DHCP when editing them (bnc#711962). Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes?rev=65520&r1=65519&r2=65520&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Fri Sep 2 16:11:42 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Sep 2 16:08:07 CEST 2011 - mvidner@suse.cz + +- Don't switch bonding interfaces to DHCP when editing them (bnc#711962). + +------------------------------------------------------------------- Wed Aug 17 15:02:50 CEST 2011 - mvidner@suse.cz - Sort of enable arbitrary interface names. Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp?rev=65520&r1=65519&r2=65520&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp Fri Sep 2 16:11:42 2011 @@ -837,8 +837,6 @@ "TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner, "TUNNEL_SET_GROUP" : LanItems::tunnel_set_group ]; - } else { - if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; } // #65524 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org