Author: mzugec
Date: Mon Oct 6 14:08:57 2008
New Revision: 51863
URL: http://svn.opensuse.org/viewcvs/yast?rev=51863&view=rev
Log:
added support for HSI (s390) devices (fate#304938)
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=51863&r1=51862&r2=51863&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Mon Oct 6 14:08:57 2008
@@ -1 +1 @@
-2.17.36
+2.17.37
Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=51863&r1=51862&r2=51863&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Mon Oct 6 14:08:57 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Oct 6 14:08:39 CEST 2008 - mzugec@suse.de
+
+- added support for HSI (s390) devices (fate#304938)
+- 2.17.37
+
+-------------------------------------------------------------------
Mon Oct 6 13:26:49 CEST 2008 - visnov@suse.cz
- adapt to new Confirm::Detection API (bnc #431276)
Modified: trunk/network/src/lan/hardware.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=51863&r1=51862&r2=51863&view=diff
==============================================================================
--- trunk/network/src/lan/hardware.ycp (original)
+++ trunk/network/src/lan/hardware.ycp Mon Oct 6 14:08:57 2008
@@ -538,7 +538,7 @@
term contents = `Empty ();
- if(LanItems::type == "qeth") {
+ if(LanItems::type == "qeth" || LanItems::type == "hsi") {
// CHANIDS
list<string> tmp_list=splitstring(LanItems::qeth_chanids, " ");
map chanids_map = $[
@@ -583,32 +583,28 @@
_("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>");
}
+/*
if(LanItems::type == "hsi") {
contents = `HBox(
`HSpacing(6),
- /* Frame label */
`Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox(
`VSpacing(1),
- /* TextEntry label */
`InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options),
`VSpacing(1),
- /* CheckBox label */
`Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))),
`VSpacing(1),
- /* CheckBox label */
`Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))),
- /* TextEntry label */
`InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress),
`VSpacing(1)
), `HSpacing(2))),
`HSpacing(6)
);
- /* S/390 dialog help: QETH */
helptext = _("<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>") +
_("<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>") +
_("<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>") +
_("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>");
}
+*/
if(drvtype == "lcs") {
contents = `HBox(
@@ -732,7 +728,7 @@
LanItems::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value);
LanItems::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value);
}
- if (LanItems::type != "hsi")
+// if (LanItems::type != "hsi")
LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value);
if(LanItems::type == "lcs")
Modified: trunk/network/src/modules/LanItems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=51863&r1=51862&r2=51863&view=diff
==============================================================================
--- trunk/network/src/modules/LanItems.ycp (original)
+++ trunk/network/src/modules/LanItems.ycp Mon Oct 6 14:08:57 2008
@@ -1592,9 +1592,13 @@
string command2="";
switch(type){
case "qeth":
+ case "hsi":
+ if (size(chan_mode)>0)
// chan_ids (read, write, control), port
- command1=sformat("qeth_configure -p %1 %2 1", chan_mode, qeth_chanids);
- command2=sformat("ls /sys/devices/%1/%2/net/|head -n1|tr -d '\n'", type, (splitstring(qeth_chanids, " "))[0]:"");
+ command1=sformat("qeth_configure -p %1 %2 1", chan_mode, qeth_chanids);
+ else
+ command1=sformat("qeth_configure %1 1", qeth_chanids);
+ command2=sformat("ls /sys/devices/qeth/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:"");
break;
case "ctc":
// chan_ids (read, write), protocol
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
