Author: mvidner Date: Fri Feb 3 13:58:55 2012 New Revision: 67359 URL: http://svn.opensuse.org/viewcvs/yast?rev=67359&view=rev Log: Fix detection of properly configured LCS and CTC devices (bnc#741071#c25) Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/VERSION?rev=67359&r1=67358&r2=67359&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Fri Feb 3 13:58:55 2012 @@ -1 +1 @@ -2.17.170 +2.17.171 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes?rev=67359&r1=67358&r2=67359&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Fri Feb 3 13:58:55 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 3 13:52:59 CET 2012 - mvidner@suse.cz + +- Fix detection of properly configured LCS and CTC devices (bnc#741071#c20) +- 2.17.171 + +------------------------------------------------------------------- Thu Jan 26 16:05:05 CET 2012 - mvidner@suse.cz - Only save LLADDR (persistent MAC) for some s390 card types, Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp?rev=67359&r1=67358&r2=67359&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Fri Feb 3 13:58:55 2012 @@ -1508,23 +1508,20 @@ 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 %1 -p %2 %3 %4 1", qeth_layer2?"-l":"", chan_mode, portnumber_param, qeth_chanids); - else - command1=sformat("qeth_configure %1 %2 %3 1", qeth_layer2?"-l":"", portnumber_param, qeth_chanids); -*/ string portname_param=(size(chan_mode)>0) ? sformat("-p %1", chan_mode) : ""; string options_param=(size(qeth_options)>0) ? sformat("-o %1", qeth_options) : ""; command1=sformat("qeth_configure %1 %2 %3 %4 %5 1", options_param, (qeth_layer2==true)?"-l":"", portname_param, portnumber_param, 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 + command1=sformat("ctc_configure %1 1 %2", qeth_chanids, chan_mode); + command2=sformat("ls /sys/devices/ctcm/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); + break; case "lcs": // chan_ids (read, write), protocol command1=sformat("ctc_configure %1 1 %2", qeth_chanids, chan_mode); - command2=sformat("ls /sys/devices/cu3088/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); + command2=sformat("ls /sys/devices/lcs/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); break; case "iucv": // router -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org