Author: mzugec Date: Wed Mar 17 09:10:00 2010 New Revision: 61353 URL: http://svn.opensuse.org/viewcvs/yast?rev=61353&view=rev Log: L3: in case of type different from config. name write INTERFACETYPE option (bnc#585458) 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 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=61353&r1=61352&r2=61353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Wed Mar 17 09:10:00 2010 @@ -1 +1 @@ -2.17.127 +2.17.128 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=61353&r1=61352&r2=61353&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 Wed Mar 17 09:10:00 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 17 09:05:30 CET 2010 - mzugec@suse.cz + +- L3: in case of type different from config. name write INTERFACETYPE +option (bnc#585458) +- 2.17.128 + +------------------------------------------------------------------- Tue Mar 16 13:14:40 CET 2010 - mzugec@suse.cz - during 1st installation stage write correctly filename for ifcfg 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=61353&r1=61352&r2=61353&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 Wed Mar 17 09:10:00 2010 @@ -1106,78 +1106,9 @@ newdev["BOOTPROTO"] = bootproto; } newdev["NAME"] = description; - if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type; -// if(unique != "" && unique != nil) newdev["udi"] = unique; -/* - if(hotplug == "") { - if(alias == "") { - // FIXME: MOD ChangeModule(NetworkInterfaces::device_name(type, device), operation == `add); - y2milestone("HWCFG name %1 (%2)", nm_name, nm_name_old); - if(hasAnyValue(nm_name) && operation == `edit && - hasAnyValue(nm_name_old) && nm_name != nm_name_old) { - y2milestone("HWCFG name change (%1) -> deleting old (%2)", nm_name, nm_name_old); - NetworkModules::DeleteM(nm_name_old); - nm_name_old = nil; - } - - if(Arch::s390 ()) { - string type2 = DriverType (type); - if(type2 == "iucv") { - NetworkModules::SCRIPTUP = "hwup-iucv"; - } - else { - NetworkModules::SCRIPTUP = "hwup-ccw"; - NetworkModules::SCRIPTUP_ccw = "hwup-ccw"; - NetworkModules::SCRIPTDOWN = "hwdown-ccw"; - NetworkModules::SCRIPTUP_ccwgroup = "hwup-" + type2; - } - - integer devid = 0; - string devstr = ""; - - y2milestone("nm_name=%1", nm_name); - string s390chanid = "[0-9]+\\.[0-9]+\\."; - if(regexpmatch(nm_name, s390chanid)) { - devid = tointeger("0x" + regexpsub(nm_name, s390chanid + "(.*)", "\\1")); - devstr = regexpsub(nm_name, ".*[^0-9](" + s390chanid + ").*", "\\1"); - } - - y2milestone("devid=%1(%2)", devid, devstr); - if(devid == nil) devid = 0; - string devid0 = String::PadZeros(regexpsub(tohexstring(devid), "0x(.*)", "\\1"), 4); - string devid1 = String::PadZeros(regexpsub(tohexstring(devid+1), "0x(.*)", "\\1"), 4); - string devid2 = String::PadZeros(regexpsub(tohexstring(devid+2), "0x(.*)", "\\1"), 4); - - if(type2 == "ctc" || type2 == "lcs") { - NetworkModules::CCW_CHAN_IDS = sformat("%1%2 %1%3", devstr, devid0, devid1); - NetworkModules::CCW_CHAN_MODE = chan_mode; - NetworkModules::CCW_CHAN_NUM = "2"; - NetworkModules::LCS_LANCMD_TIMEOUT = lcs_timeout; - } - else if(type2 == "qeth") { - NetworkModules::CCW_CHAN_IDS = sformat("%1%2 %1%3 %1%4", devstr, devid0, devid1, devid2); - NetworkModules::CCW_CHAN_MODE = chan_mode; - NetworkModules::CCW_CHAN_NUM = "3"; - NetworkModules::QETH_OPTIONS = qeth_options; - NetworkModules::QETH_IPA_TAKEOVER = ipa_takeover? "1": "0"; - NetworkModules::QETH_LAYER2_SUPPORT = qeth_layer2? "1": "0"; - if (qeth_layer2 && qeth_macaddress != "00:00:00:00:00:00") { - newdev["LLADDR"] = qeth_macaddress; - } - else { - // #151196: layer 3 otherwise fails - newdev["LLADDR"] = ""; - } - } - - } - - // If "", no hwcfg is created. See also #42421. - if (NetworkModules::ChangeM(nm_name)) Items[current, "hwcfg"]=nm_name; - else Items[current, "hwcfg"]=""; - } - } -*/ + // L3: bnc#585458 +// if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type; + if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type) newdev["INTERFACETYPE"]=type; if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org