Author: mvidner Date: Thu Aug 11 16:36:06 2011 New Revision: 65314 URL: http://svn.opensuse.org/viewcvs/yast?rev=65314&view=rev Log: Omit unnecessary INTERFACETYPE declaration in ifcfg (bnc#704999, bnc#711762) This broke the VM-proposed bridge because it copied ifcfg-ethN's INTERFACETYPE=eth Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/VERSION?rev=65314&r1=65313&r2=65314&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Thu Aug 11 16:36:06 2011 @@ -1 +1 @@ -2.17.159 +2.17.160 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes?rev=65314&r1=65313&r2=65314&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Thu Aug 11 16:36:06 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Aug 11 16:33:26 CEST 2011 - mvidner@suse.cz + +- Omit unnecessary INTERFACETYPE declaration in ifcfg (bnc#711762) + This broke the VM-proposed bridge because it copied ifcfg-ethN's + INTERFACETYPE=eth (bnc#704999). +- 2.17.160 + +------------------------------------------------------------------- Wed Aug 3 17:09:21 CEST 2011 - mvidner@suse.cz - inst_hostname: do write the randomized /etc/HOSTNAME if left Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp?rev=65314&r1=65313&r2=65314&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Thu Aug 11 16:36:06 2011 @@ -1233,7 +1233,8 @@ // L3: bnc#585458 // FIXME: INTERFACETYPE confuses sysconfig, bnc#458412 // Only test when newdev has enough info for GetTypeFromIfcfg to work. - if (NetworkInterfaces::GetTypeFromIfcfg(newdev) != type) { + string implied_type = NetworkInterfaces::GetTypeFromIfcfg(newdev); + if (implied_type != nil && implied_type != type) { newdev["INTERFACETYPE"]=type; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org