[yast-commit] r58273 - in /branches/SuSE-SLE-10-SP3-Branch/network: VERSION package/yast2-network.changes src/lan/hardware.ycp src/modules/Lan.ycp
Author: mzugec Date: Tue Aug 4 14:52:38 2009 New Revision: 58273 URL: http://svn.opensuse.org/viewcvs/yast?rev=58273&view=rev Log: s390: correctly configure hsi devices (bnc#406091) Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/VERSION?rev=58273&r1=58272&r2=58273&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/VERSION Tue Aug 4 14:52:38 2009 @@ -1 +1 @@ -2.13.132 +2.13.133 Modified: branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes?rev=58273&r1=58272&r2=58273&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes Tue Aug 4 14:52:38 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 4 14:49:57 CEST 2009 - mzugec@suse.de + +- s390: correctly configure hsi devices (bnc#406091) +- 2.13.133 + +------------------------------------------------------------------- Thu Jun 25 15:36:09 CEST 2009 - mzugec@suse.de - for lcs and ctc offer only 2 CHAN_IDS (bnc#515492) Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp?rev=58273&r1=58272&r2=58273&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp Tue Aug 4 14:52:38 2009 @@ -790,11 +790,11 @@ Lan::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); Lan::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); } - else if (Lan::type != "hsi"){ + else //if (Lan::type != "hsi"){ Lan::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); // for ficon and escon devices configure chan_ids (#181998) if (contains(["ficon", "escon"], Lan::type)) Lan::qeth_chanids = (string) UI::QueryWidget(`id(`qeth_chanids), `Value); - } +// } if(Lan::type == "lcs") Lan::lcs_timeout = (string) UI::QueryWidget(`id(`lcs_timeout), `Value); Lan::qeth_chanids = (string) UI::QueryWidget(`id(`qeth_chanids), `Value); Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp?rev=58273&r1=58272&r2=58273&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp Tue Aug 4 14:52:38 2009 @@ -306,10 +306,11 @@ if (Arch::s390()) { // handle HSI like qeth, S#40692#c15 - if (type == "hsi") - drvtype = "qeth"; + // if (type == "hsi") +// drvtype = "qeth"; // Should eth occur on s390? - else if (type == "tr" || type == "eth") +// else + if (type == "tr" || type == "eth") drvtype = "lcs"; // N#82891 else if (type == "escon" || type == "ficon") @@ -1300,7 +1301,8 @@ NetworkModules::SCRIPTUP = "hwup-ccw"; NetworkModules::SCRIPTUP_ccw = "hwup-ccw"; NetworkModules::SCRIPTDOWN = "hwdown-ccw"; - NetworkModules::SCRIPTUP_ccwgroup = "hwup-" + type2; + if (type2=="hsi") NetworkModules::SCRIPTUP_ccwgroup = "hwup-qeth"; + else NetworkModules::SCRIPTUP_ccwgroup = "hwup-" + type2; } /* integer devid = 0; @@ -1327,7 +1329,7 @@ NetworkModules::CCW_CHAN_NUM = "2"; NetworkModules::LCS_LANCMD_TIMEOUT = lcs_timeout; } - else if(type2 == "qeth") { + else if(type2 == "qeth"||type2 == "hsi") { NetworkModules::CCW_CHAN_IDS = qeth_chanids; //sformat("%1%2 %1%3 %1%4", devstr, devid0, devid1, devid2); NetworkModules::CCW_CHAN_MODE = chan_mode; NetworkModules::QETH_PORTNO = port_num; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
mzugec@svn.opensuse.org