Author: mzugec Date: Thu Mar 11 10:30:02 2010 New Revision: 61250 URL: http://svn.opensuse.org/viewcvs/yast?rev=61250&view=rev Log: L3: update device name via which is system installed by AY (bnc#578760) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp trunk/network/src/modules/LanUdevAuto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=61250&r1=61249&r2=61250&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Mar 11 10:30:02 2010 @@ -1 +1 @@ -2.19.13 +2.19.14 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=61250&r1=61249&r2=61250&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Mar 11 10:30:02 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 11 10:29:11 CET 2010 - mzugec@suse.cz + +- L3: update device name via which is system installed by AY +(bnc#578760) +- 2.19.14 + +------------------------------------------------------------------- Tue Mar 2 09:57:05 CET 2010 - mzugec@suse.cz - NetHwDetection: use blacklist (bnc#580729) Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=61250&r1=61249&r2=61250&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Thu Mar 11 10:30:02 2010 @@ -32,6 +32,7 @@ // global variable because chrooted environment integer network_disk=0; +string netdevice=""; /** * Read one install.inf item @@ -116,6 +117,13 @@ /* Split network device */ string netdevice = InstallInf["netdevice"]:""; + if (Mode::autoinst()){ + string new_devname = LanUdevAuto::GetDevnameByMAC(InstallInf["hwaddr"]:""); + if (size(new_devname)>0){ + y2internal("old devname: %1, new devname: %2", netdevice, new_devname); + netdevice=new_devname; + } + } if(netdevice != "") { string devtype = NetworkInterfaces::device_type(netdevice); if(devtype != nil && devtype != "") InstallInf["type"] = devtype; @@ -307,9 +315,9 @@ if (size(InstallInf["remote_ip"]:"")>0) network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); - string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); + string ifcfg = sformat("ifcfg-%1", netdevice); - string hw_name = BuildDescription(NetworkInterfaces::device_type(InstallInf["netdevice"]:""), NetworkInterfaces::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); + string hw_name = BuildDescription(NetworkInterfaces::device_type(netdevice), NetworkInterfaces::device_num(ifcfg), $["dev_name":netdevice], hardware); // protect special characters, #305343 if (size(hw_name)>0) network_configuration = sformat("%1NAME='%2'\n", network_configuration, String::Quote (hw_name)); @@ -320,13 +328,8 @@ string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); // string dev_file=sformat("/tmp/%1", ifcfg); -// if (!FileUtils::Exists(dev_file)) -// { SCR::Write(.target.string, dev_file, network_configuration); y2milestone("ifcfg file: %1", dev_file); -// } -// else -// y2warning("File exists %1", dev_file); } /* @@ -518,7 +521,7 @@ y2milestone("%1 does not exist yet, creating it", udev_rules_destdir); WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", udev_rules_destdir)); } else - y2internal("file %1 exists", udev_rules_destdir); + y2milestone("File %1 exists", udev_rules_destdir); if (! FileUtils::Exists( net_destfile )) { Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.ycp?rev=61250&r1=61249&r2=61250&view=diff ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Thu Mar 11 10:30:02 2010 @@ -200,14 +200,6 @@ } }); } else{ -/* - list<map> all_devices=[]; -y2internal("export devices %1", devices); - foreach(string key, (list<string>)Map::Keys(devices), { - all_devices=add(all_devices, devices[key]:$[]); - }); - y2internal("export rules %1", createUdevFromIfaceName(all_devices)); -*/ foreach(integer id, map row, (map >)LanItems::Items, { LanItems::current=id; if (size(row["ifcfg"]:"")>0){ @@ -231,4 +223,29 @@ return AY; } +global string GetDevnameByMAC(string mac){ + string devname=""; + if (size(mac)>0){ + foreach(integer id, map row, (map >)LanItems::Items, { + LanItems::current=id; + string name = LanItems::GetItemUdev("NAME"); + string mac_rule = LanItems::GetItemUdev("ATTR{address}"); + if (size(mac_rule)==0){ + y2error("No MAC rule %1", row); + continue; + } else + y2internal("MAC rule %1", row); + if (mac_rule==mac){ + devname=name; + y2internal("Rule matched! New devname %1", devname); + break; + } + }); + + } else y2warning("No MAC address to compare."); + return devname; +} + + + } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org