Author: mzugec Date: Fri Aug 17 15:47:03 2007 New Revision: 40339 URL: http://svn.opensuse.org/viewcvs/yast?rev=40339&view=rev Log: use correct NAME for eth/wlan devices (#300670) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp trunk/network/src/modules/LanItems.ycp trunk/network/src/modules/NetHwDetection.ycp trunk/network/src/routines/complex.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40339&r1=40338&r2=40339&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Aug 17 15:47:03 2007 @@ -1 +1 @@ -2.15.63 +2.15.64 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=40339&r1=40338&r2=40339&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Aug 17 15:47:03 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 17 15:51:42 CEST 2007 - mzugec@suse.cz + +- use correct NAME for eth/wlan devices (#300670) +- 2.15.64 + +------------------------------------------------------------------- Fri Aug 17 12:59:40 CEST 2007 - mzugec@suse.cz - fixed proposal dialog for DSL, ISDN and modem (#298273) Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=40339&r1=40338&r2=40339&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Fri Aug 17 15:47:03 2007 @@ -22,6 +22,7 @@ import "String"; include "network/routines.ycp"; +include "network/complex.ycp"; map InstallInf = $[]; @@ -164,74 +165,10 @@ return ""; } -/* -string getHWFullPath(string hwfile){ - return sformat("%1/hwcfg-%2", "/etc/sysconfig/hardware", hwfile); -} -*/ map hwcfg=$[]; -/* -string CreateHardwareFile(){ - string hwfile=""; - map hw=$[]; - // read current hardware information and check if configuration file exists - hwcfg=getcfg("-f hwcfg- -d /etc/sysconfig/hardware", InstallInf["netdevice"]:""); - -hw=getHardware(hwcfg["HWD_DEVICEPATH"]:"", (list<map>)SCR::Read(.probe.netcard)); - -y2milestone("hwinfo %1", hw); - - if( tointeger(hwcfg["HWD_CONFIG_N"]:"0")==0 ){ - y2internal("hwcfg doesn't exist"); - -y2internal("need hwcfg: %1", needHwcfg(hw)); - // check if driver is connected to bus - if (tointeger(hwcfg["HWD_BUS_N"]:"0")>0){ - string busname = hwcfg[sformat("HWD_BUSNAME_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; - string busid = hwcfg[sformat("HWD_BUSID_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; - if (busname == "vio" && FileUtils::IsDirectory("/proc/iSeries")){ - // Bug 159652 - LTC22358 - no hwcfg-static files created for iseries_veth - hwfile = sformat("static-0"); - y2warning("vio bus type, using %1", hwfile); - } else { - // #208854 - include "static" string for ISA cards - if (busname=="isa") - { - hwfile = sformat("static-bus-%1-%2", busname, busid); - y2internal("will create hwcfg file %1", hwfile); - } else { - hwfile = sformat("bus-%1-%2", busname, busid); - y2internal("hwcfg filename %1", hwfile); - } - } - } else { - hwfile = sformat("static-0"); - y2error("Not connected to bus! Using %1", hwfile); - } - string content=sformat("STARTMODE='auto'\nMODULE='%1'\nMODULE_OPTIONS='%2'\n", InstallInf["module"]:"", InstallInf["options"]:""); - if (needHwcfg(hw)) { - y2internal ("creating %1 file\n%2", hwfile, content); - SCR::Write(.target.string, getHWFullPath(hwfile), content); - } - else { - y2warning("no hwcfg needed"); - hwfile = ""; - } - }else { - // in case of s390 hwcfg is created by Linuxrc (uli) - y2warning("hwcfg already exists"); - hwfile = hwcfg[sformat("HWD_CONFIG_%1", tointeger(hwcfg["HWD_CONFIG_N"]:"0")-1)]:""; - y2internal("configuration name = %1", hwfile); - } - y2internal("Hardware file: %1", getHWFullPath(hwfile)); - - return hwfile; -} -*/ - -void CreateIfcfg(string ifcfg){ +void CreateIfcfg(){ string network_configuration=""; // set BOOTPROTO=[ static | dhcp ] if (InstallInf["bootproto"]:"dhcp"=="static") { @@ -251,20 +188,6 @@ if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); -/* - if (size(InstallInf["unique"]:"")>0) - { - // write UNIQUE - #suse25739 - network_configuration = sformat("%1UNIQUE='%2'\n", network_configuration, InstallInf["unique"]:""); -*/ - // write UDI -/* - list<map> cards=(list<map>)SCR::Read(.probe.netcard); - foreach(map card, cards, { - if (card["unique_key"]:""==InstallInf["unique"]:"") network_configuration = sformat("%1udi='%2'\n", network_configuration, card["udi"]:""); - }); - } -*/ if (network_disk){ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); } else{network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); @@ -275,9 +198,17 @@ // point to point interface if (size(InstallInf["remote_ip"]:"")>0)network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); + list<map> hardware=ReadHardware("netcard"); +y2internal("hardware %1", hardware); +string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - y2internal("Network Configuration:\n%1\n%2", network_configuration, ifcfg); + string hw_name = BuildDescription(NetworkDevices::device_type(ifcfg), NetworkDevices::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); +y2internal("name %1", hw_name); + if (size(hw_name)>0) network_configuration = sformat("%1NAME='%2'\n", network_configuration, hw_name); + + + y2internal("Network Configuration:\n%1\nifcfg file: %2", network_configuration, ifcfg); // write only if file doesn't exists string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); @@ -339,8 +270,6 @@ integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); WFM::SCRSetDefault (new_SCR); -// SCR::Execute(.target.bash, sformat("cp /etc/sysconfig/hardware/* %1/etc/sysconfig/hardware/ 2>/dev/null", Installation::destdir)); - // when root is on nfs/iscsi set startmode=nfsroot #176804 string device = NetworkStorage::getDevice( Installation::destdir ); y2internal("%1 directory is on %2 device", Installation::destdir, device); @@ -372,9 +301,9 @@ if(ReadInstallInf()){ // string hwcfgname = CreateHardwareFile(); - string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); //getIfcName(hwcfg[sformat("HWD_INTERFACE_%1", tointeger(hwcfg["HWD_INTERFACE_N"]:"0")-1)]:"" ); +// string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - CreateIfcfg(ifcfg); + CreateIfcfg(); CreateOtherNetworkFiles(); SCR::Execute(.target.bash, "chkconfig network on"); Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=40339&r1=40338&r2=40339&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Fri Aug 17 15:47:03 2007 @@ -215,11 +215,9 @@ foreach(string tmpdevname, (list<string>)Map::Keys(NetworkDevices::FilterDevices("netcard")["eth"]:$[]), { string confname = NetworkDevices::device_name("eth", tmpdevname); -// map config = getcfg(confname, ""); integer pos = nil; map val = $[]; foreach(integer key, map value, (map >)Items, { -// if (config["HWD_DEVICEPATH"]:"" == sformat("/sys%1", value["hwinfo", "sysfs_id"]:"")) { if (value["hwinfo", "dev_name"]:""==confname) { pos = key; val = value; @@ -229,7 +227,6 @@ pos=size(Items); Items[pos]=$[]; } -// Items[pos, "hwcfg"] = val[sformat("HWD_INTERFACE_%1", tointeger(val["HWD_INTERFACE_N"]:"0")-1)]:""; Items[pos, "ifcfg"] = confname; }); @@ -249,8 +246,6 @@ } }); }); - - y2milestone("LanItems::Items %1", Items); } @@ -287,15 +282,15 @@ foreach(integer key, (list<integer>)Map::Keys(Items), { string rich = ""; string ip = _("Not configured"); - string descr = HardwareName (Hardware, Items[key, "hwinfo", "udi"]:""); + string descr = HardwareName (Hardware, Items[key, "hwinfo", "dev_name"]:""); + type = Items[key, "hwinfo", "type"]:""; descr = CheckEmptyName (type, descr); list <string> bullets = []; if (hasAnyValue(Items[key, "ifcfg"]:"") ){ NetworkDevices::Select(Items[key, "ifcfg"]:""); - type = Items[key, "hwinfo", "type"]:""; if (!hasAnyValue(type)) type = NetworkDevices::device_type(Items[key, "ifcfg"]:""); - descr = CheckEmptyName (type, ""); + descr = BuildDescription(type, NetworkDevices::device_type(Items[key, "ifcfg"]:""), NetworkDevices::Current, [Items[key, "hwinfo"]:$[]]); string dev = NetworkDevices::device_name(type, NetworkDevices::Name); ip = DeviceProtocol(NetworkDevices::Current); string status = DeviceStatus(type, NetworkDevices::device_num(NetworkDevices::Name), NetworkDevices::Current); Modified: trunk/network/src/modules/NetHwDetection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetHwDetection.ycp?rev=40339&r1=40338&r2=40339&view=diff ============================================================================== --- trunk/network/src/modules/NetHwDetection.ycp (original) +++ trunk/network/src/modules/NetHwDetection.ycp Fri Aug 17 15:47:03 2007 @@ -1,5 +1,5 @@ /** - * File: modules/Detection.ycp + * File: modules/NetHwDetection.ycp * Package: Network configuration * Summary: Network detection * Authors: Michal Svec Modified: trunk/network/src/routines/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/complex.ycp?rev=40339&r1=40338&r2=40339&view=diff ============================================================================== --- trunk/network/src/routines/complex.ycp (original) +++ trunk/network/src/routines/complex.ycp Fri Aug 17 15:47:03 2007 @@ -36,17 +36,15 @@ */ define string BuildDescription (string devtype, string devnum, map devmap, list<map> Hardware) { +y2internal("devmap %1", devmap); string descr = devmap["NAME"]:""; - if (descr != "") - { - return descr; - } + if (descr != "") return descr; descr = HardwareName (Hardware, devnum); - if (descr != "") - { - return descr; - } + if (descr != "") return descr; descr = HardwareName (Hardware, devmap["UDI"]:""); + if (descr != "") return descr; + descr = HardwareName (Hardware, devmap["dev_name"]:""); + if (descr != "") return descr; descr = CheckEmptyName (devtype, descr); return descr; } @@ -335,6 +333,7 @@ "id-" + h["mac"]:"", "bus-" + h["bus"]:"" + String::OptFormat("-%1", h["busid"]:""), h["udi"]:"", + h["dev_name"]:"", ]; y2debug ("what: %1, have: %2", id, have); if (contains (have, id)) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org