Author: mzugec Date: Fri Nov 28 15:01:12 2008 New Revision: 53709 URL: http://svn.opensuse.org/viewcvs/yast?rev=53709&view=rev Log: support for portnumber option (fate#304080) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/hardware.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=53709&r1=53708&r2=53709&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Nov 28 15:01:12 2008 @@ -1 +1 @@ -2.17.58 +2.17.59 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=53709&r1=53708&r2=53709&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Nov 28 15:01:12 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 28 14:58:43 CET 2008 - mzugec@suse.cz + +- support for portnumber option (fate#304080) +- 2.17.59 + +------------------------------------------------------------------- Thu Nov 27 11:21:48 CET 2008 - kmachalkova@suse.cz - Removed source of UI syntax error in ISDN - invalid widget ID Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=53709&r1=53708&r2=53709&view=diff ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Fri Nov 28 15:01:12 2008 @@ -546,8 +546,11 @@ /* Frame label */ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), - /* TextEntry label */ - `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Name"), LanItems::chan_mode), + `HBox( + /* TextEntry label */ + `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Name"), LanItems::chan_mode), + `ComboBox(`id(`qeth_portnumber), _("Port Number"), [`item(`id("0"), "0", true), `item(`id("1"), "1")]) + ), `VSpacing(1), /* TextEntry label */ `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options), @@ -733,6 +736,7 @@ LanItems::ipa_takeover = (boolean) UI::QueryWidget(`id(`ipa_takeover), `Value); LanItems::qeth_layer2 = (boolean) UI::QueryWidget(`id(`qeth_layer2), `Value); LanItems::qeth_macaddress = (string) UI::QueryWidget(`id(`qeth_macaddress), `Value); + LanItems::qeth_portnumber = (string) UI::QueryWidget(`id(`qeth_portnumber), `Value); } string read = (string) UI::QueryWidget(`id(`qeth_chan_read), `Value); string write = (string) UI::QueryWidget(`id(`qeth_chan_write), `Value); Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=53709&r1=53708&r2=53709&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Fri Nov 28 15:01:12 2008 @@ -118,6 +118,7 @@ /* s390 options */ // portname is in ifcfg, others are in hwcfg global string portname = ""; +global string qeth_portnumber = ""; global string chan_mode = "0"; global string qeth_options = ""; global boolean ipa_takeover = false; @@ -1582,11 +1583,12 @@ switch(type){ case "qeth": case "hsi": + string portnumber_param = (size(qeth_portnumber)>0) ? sformat("-n %1", qeth_portnumber) : ""; if (size(chan_mode)>0) // chan_ids (read, write, control), port - command1=sformat("qeth_configure -p %1 %2 1", chan_mode, qeth_chanids); + command1=sformat("qeth_configure -p %1 %2 %3 1", chan_mode, portnumber_param, qeth_chanids); else - command1=sformat("qeth_configure %1 1", qeth_chanids); + command1=sformat("qeth_configure %1 %2 1", portnumber_param, qeth_chanids); command2=sformat("ls /sys/devices/qeth/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); break; case "ctc": -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org