Author: mzugec Date: Mon Dec 6 15:47:24 2010 New Revision: 62951 URL: http://svn.opensuse.org/viewcvs/yast?rev=62951&view=rev Log: L3: AY Layer2 support - fixed portname option (bnc#573607) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=62951&r1=62950&r2=62951&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon Dec 6 15:47:24 2010 @@ -1 +1 @@ -2.17.148 +2.17.149 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=62951&r1=62950&r2=62951&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Mon Dec 6 15:47:24 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 6 15:46:53 CET 2010 - mzugec@suse.cz + +- L3: AY Layer2 support - fixed portname option (bnc#573607) +- 2.17.149 + +------------------------------------------------------------------- Mon Nov 29 14:01:27 CET 2010 - mzugec@suse.cz - reverted changed strings (qinternet/kinternet) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp?rev=62951&r1=62950&r2=62951&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp Mon Dec 6 15:47:24 2010 @@ -1558,7 +1558,7 @@ */ 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?"-l":"", portname_param, portnumber_param, qeth_chanids); + 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": Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp?rev=62951&r1=62950&r2=62951&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp Mon Dec 6 15:47:24 2010 @@ -99,9 +99,9 @@ if (oldStyle(settings)) settings["interfaces"] = createUdevFromIfaceName(settings["interfaces"]:[]); else udev_rules = settings["net-udev"]:[]; /* if (Arch::s390())*/ s390_devices=settings["s390-devices"]:[]; - y2internal("interfaces: %1", settings["interfaces"]:[]); - y2internal("net-udev rules:%1", udev_rules); - y2internal("s390-devices rules:%1", s390_devices); + y2milestone("interfaces: %1", settings["interfaces"]:[]); + y2milestone("net-udev rules:%1", udev_rules); + y2milestone("s390-devices rules:%1", s390_devices); return true; } @@ -127,6 +127,7 @@ LanItems::type=rule["type"]:""; LanItems::qeth_chanids=rule["chanids"]:""; LanItems::qeth_layer2 = rule["layer2"]:false; +// LanItems::qeth_portnumber = rule["portnumber"]:""; switch(rule["type"]:""){ case "qeth": LanItems::chan_mode=rule["portname"]:""; @@ -138,6 +139,12 @@ LanItems::chan_mode=rule["router"]:""; break; } + y2milestone("rule:%1", rule); + y2milestone("type:%1", LanItems::type); + y2milestone("chanids:%1", LanItems::qeth_chanids); + y2milestone("layer2:%1", LanItems::qeth_layer2); + y2milestone("portname:%1", LanItems::chan_mode); +// y2milestone("portnumber:%1", LanItems::qeth_portnumber); LanItems::createS390Device(); y2internal("rule %1", rule); }); @@ -188,7 +195,7 @@ AY["s390-devices", device]=$["type":device_type]; if (size(chanids)>0) AY["s390-devices", device, "chanids"]=chanids; -// if (size(portname)>0) AY[device, "portname"]=portname; + if (size(portname)>0) AY["s390-devices",device, "portname"]=portname; if (size(protocol)>0) AY["s390-devices", device, "protocol"]=protocol; if (layer2) AY["s390-devices", device, "layer2"]=true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org