Author: mzugec Date: Tue Nov 3 15:36:36 2009 New Revision: 59279 URL: http://svn.opensuse.org/viewcvs/yast?rev=59279&view=rev Log: support for ETHTOOL_OPTIONS (FaTE#305352) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/hardware.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=59279&r1=59278&r2=59279&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Nov 3 15:36:36 2009 @@ -1 +1 @@ -2.18.53 +2.18.54 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=59279&r1=59278&r2=59279&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Nov 3 15:36:36 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 3 15:32:18 CET 2009 - mzugec@suse.cz + +- support for ETHTOOL_OPTIONS (FaTE#305352) +- 2.18.54 + +------------------------------------------------------------------- Thu Oct 29 17:47:14 CET 2009 - mzugec@suse.cz - physical identification for NIC cards (FaTE#307164) Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=59279&r1=59278&r2=59279&view=diff ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Tue Nov 3 15:36:36 2009 @@ -51,6 +51,9 @@ _("<p>Additionally, you may specify <b>Options</b> for the Kernel module. Use this format: <i>option</i>=<i>value</i>. Each entry should be space separated,for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are configured with the same module name, options will be merged while saving.</p> +") + + +_("<p>If you write something into <b>Ethtool options</b>, ifup will call ethtool with this options.</p> "); if(!(LanItems::operation == `edit || Arch::s390 ())) @@ -127,6 +130,7 @@ hardware["no_hotplug"] = hardware["hotplug"]:"" == ""; hardware["no_hotplug_dummy"] = hardware["no_hotplug"]:false && hardware["type"]:"" != "dummy"; + hardware["ethtool_options"] = LanItems::ethtool_options; } @@ -213,11 +217,20 @@ ) ); + term EthtoolWidget = + `Frame(_("Ethtool options"), + `HBox( + `InputField(`id(`ethtool_opts), `opt(`hstretch), _("Options"), hardware["ethtool_options"]:"") + ) + + ); + term contents = `VBox( `HBox(UdevWidget,`HStretch(), BlinkCard), TypeNameWidgets, KernelBox, + EthtoolWidget, `VStretch() ); @@ -521,6 +534,7 @@ string driver = (string) UI::QueryWidget(`modul, `Value); LanItems::setDriver(driver); LanItems::driver_options[driver] = (string) UI::QueryWidget(`options, `Value); + LanItems::ethtool_options = (string) UI::QueryWidget(`ethtool_opts, `Value); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org