Author: mzugec Date: Thu Nov 19 16:57:10 2009 New Revision: 59625 URL: http://svn.opensuse.org/viewcvs/yast?rev=59625&view=rev Log: support for BOOTPROTO=ibft (bnc#551380) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=59625&r1=59624&r2=59625&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Thu Nov 19 16:57:10 2009 @@ -1 +1 @@ -2.17.108 +2.17.109 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=59625&r1=59624&r2=59625&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Thu Nov 19 16:57:10 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 19 16:54:15 CET 2009 - mzugec@suse.cz + +- support for BOOTPROTO=ibft (bnc#551380) +- 2.17.109 + +------------------------------------------------------------------- Mon Nov 9 14:32:22 CET 2009 - mzugec@suse.de - allow physical indentification only when edit device Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp?rev=59625&r1=59624&r2=59625&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Thu Nov 19 16:57:10 2009 @@ -206,6 +206,7 @@ UI::ChangeWidget(`ipaddr, `Enabled, current==`static); UI::ChangeWidget(`netmask, `Enabled, current==`static); UI::ChangeWidget(`hostname, `Enabled, current==`static); + UI::ChangeWidget(`ibft, `Enabled, current==`none); } /** @@ -215,6 +216,8 @@ */ void initBootProto (string key) { if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty()); + else if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left( + `RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)")))); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -240,6 +243,9 @@ break; case "none" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `none); break; + case "ibft" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `none); + UI::ChangeWidget(`id(`ibft), `Value, true); + break; } enableDisableBootProto((symbol)UI::QueryWidget(`id(`bootproto), `CurrentButton)); } @@ -249,7 +255,7 @@ if (event["EventReason"]:""=="ValueChanged"){ symbol current = (symbol)UI::QueryWidget(`id(`bootproto), `CurrentButton); enableDisableBootProto(current); - if (current == `none) settings["STARTMODE"] = "off"; +// if (current == `none) settings["STARTMODE"] = "off"; } return nil; } @@ -263,7 +269,10 @@ */ void storeBootProto (string key, map event) { switch((symbol)UI::QueryWidget(`id(`bootproto), `CurrentButton)){ - case `none : settings["BOOTPROTO"]="none"; + case `none : string bootproto="none"; + if (UI::WidgetExists(`id(`ibft))) + bootproto = (boolean)UI::QueryWidget(`id(`ibft), `Value) ? "ibft" : "none"; + settings["BOOTPROTO"]=bootproto; settings["IPADDR"] = ""; settings["NETMASK"] = ""; settings["PREFIXLEN"] = ""; @@ -647,7 +656,14 @@ "custom_widget": `RadioButtonGroup(`id(`bootproto), `VBox( - `ReplacePoint(`id(`rp), `Left(`RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)")))), + `ReplacePoint(`id(`rp), + `Left( + `HBox( + `RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)")), + `HSpacing(1), + `CheckBox(`id(`ibft), `opt(`notify), _("Use iBFT values")) + ) + )), `Left(`HBox( `RadioButton(`id(`dynamic), `opt(`notify), _("Dynamic Address")), `ComboBox(`id(`dyn), "", [ Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp?rev=59625&r1=59624&r2=59625&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp Thu Nov 19 16:57:10 2009 @@ -139,6 +139,9 @@ This is particularly useful for bonding ethernet devices.</p> ") + + _("<p>Check <b>iBFT</b> if you want to keep network configured in your BIOS.</p> +") + + /* Address dialog help 2/8 */ _("<p>Select <b>Dynamic Address</b> if you do not have a static IP address assigned by the system administrator or your Internet provider.</p> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org