Author: mzugec
Date: Mon Nov 8 16:41:40 2010
New Revision: 62763
URL: http://svn.opensuse.org/viewcvs/yast?rev=62763&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:
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/clients/save_network.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=62763&r1=62762&r2=62763&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon Nov 8 16:41:40 2010
@@ -1 +1 @@
-2.17.143
+2.17.144
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=62763&r1=62762&r2=62763&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 Nov 8 16:41:40 2010
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Nov 8 16:40:34 CET 2010 - mzugec@suse.de
+
+- TP-L3: if possible, for temporary installation network use same
+device with same MAC address, even if devicename changed (bnc#648270)
+- 2.17.144
+
+-------------------------------------------------------------------
Wed Oct 27 13:28:04 CEST 2010 - mzugec@suse.cz
- AY: when no network profile, don't change network configuration
Modified: branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp?rev=62763&r1=62762&r2=62763&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp Mon Nov 8 16:41:40 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: 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=62763&r1=62762&r2=62763&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 Nov 8 16:41:40 2010
@@ -229,22 +229,16 @@
global string GetDevnameByMAC(string mac){
string devname="";
if (size(mac)>0){
- foreach(integer id, map