Mailinglist Archive: yast-commit (216 mails)

[mzugec@xxxxxxxxxxxxxxxxx]

Author: mzugec
Date: Mon Nov  8 15:49:43 2010
New Revision: 62761

URL: http://svn.opensuse.org/viewcvs/yast?rev=62761&view=rev
Log:
- TP-L3: if possible, for temporary installation network use same
device with same MAC address, even if devicename changed (bnc#648270)

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=62761&r1=62760&r2=62761&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Mon Nov  8 15:49:43 2010
@@ -1 +1 @@
-2.20.1
+2.20.2

Modified: trunk/network/package/yast2-network.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62761&r1=62760&r2=62761&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Mon Nov  8 15:49:43 2010
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Nov  8 15:28:20 CET 2010 - mzugec@xxxxxxx
+
+- TP-L3: if possible, for temporary installation network use same
+device with same MAC address, even if devicename changed (bnc#648270)
+- 2.20.2 
+
+-------------------------------------------------------------------
 Wed Nov  3 17:03:37 CET 2010 - mzugec@xxxxxxx
 
 - support for ordering in bonding slaves (bnc#640611)

Modified: trunk/network/src/clients/save_network.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=62761&r1=62760&r2=62761&view=diff
==============================================================================
--- trunk/network/src/clients/save_network.ycp (original)
+++ trunk/network/src/clients/save_network.ycp Mon Nov  8 15:49:43 2010
@@ -64,6 +64,7 @@
  * @return true on success
  */
 define boolean ReadInstallInf() {
+    y2milestone("ReadInstallInf()");
 
     /* Detect install.inf location */
     path install_inf = nil;
@@ -117,10 +118,14 @@
 
     /* Split network device */
     netdevice = InstallInf["netdevice"]:"";
+    y2milestone("InstallInf::netdevice:%1", netdevice);
     if (Mode::autoinst()){
+       // if possible, for temporary installation network use same device
+       // with same MAC address (even if devicename changed) (bnc#648270)
        string new_devname = 
LanUdevAuto::GetDevnameByMAC(InstallInf["hwaddr"]:"");
+       y2milestone("LanUdevAuto::netdevice:%1", new_devname);
        if (size(new_devname)>0){
-       y2internal("old devname: %1, new devname: %2", netdevice, new_devname);
+       y2milestone("old devname: %1, new devname: %2", netdevice, new_devname);
        netdevice=new_devname;
        }
     }

Modified: trunk/network/src/modules/LanUdevAuto.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.ycp?rev=62761&r1=62760&r2=62761&view=diff
==============================================================================
--- trunk/network/src/modules/LanUdevAuto.ycp (original)
+++ trunk/network/src/modules/LanUdevAuto.ycp Mon Nov  8 15:49:43 2010
@@ -229,22 +229,16 @@
 global string GetDevnameByMAC(string mac){
  string devname="";
  if (size(mac)>0){
-  foreach(integer id, map<string, any> row, (map<integer, map <string, any> 
> )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
-       y2milestone("MAC rule %1", row);
-    if (mac_rule==mac){
-       devname=name;
-     y2milestone("Rule matched! New devname %1", devname);
-     break;
-    }
+  y2milestone("MAC address from 1st stage: %1", mac);
+  foreach(map rule, udev_rules, {
+   if (rule["rule"]:""=="ATTR{address}"){
+     if (mac==rule["value"]:""){
+       devname=rule["name"]:"";
+       y2milestone("MAC address matched with device:%1", rule["name"]:"");
+       break;
+     }
+   }
   });
-
  } else y2warning("No MAC address to compare.");
  return devname;
 }

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx