Author: mvidner Date: Mon Jun 6 18:42:30 2011 New Revision: 64235 URL: http://svn.opensuse.org/viewcvs/yast?rev=64235&view=rev Log: use GetTypeFromIfcfg to properly recognize VLAN ifcfgs Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in 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=64235&r1=64234&r2=64235&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 Mon Jun 6 18:42:30 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 4 14:56:00 UTC 2011 - mvidner@suse.cz + +- ifcfg-ethX.Y style config files for VLAN(fate#309240) + +------------------------------------------------------------------- Fri Jun 3 13:42:51 CEST 2011 - mvidner@suse.cz - Make the hostname resolvable to our static address coming from @@ -18,12 +23,6 @@ - 2.17.153 ------------------------------------------------------------------- -Thu Dec 23 00:44:01 CET 2010 - mzugec@suse.de - -- ifcfg-ethX.Y style config files for VLAN(fate#309240) -- 2.17.152 - -------------------------------------------------------------------- Fri Dec 17 10:05:06 CET 2010 - mzugec@suse.de - L3: don't propose bridge for vbox (bnc#648044) 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=64235&r1=64234&r2=64235&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 Mon Jun 6 18:42:30 2011 @@ -1109,9 +1109,6 @@ newdev["BOOTPROTO"] = bootproto; } newdev["NAME"] = description; - // L3: bnc#585458 -// if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type; -// if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type) newdev["INTERFACETYPE"]=type; if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes"; @@ -1212,6 +1209,14 @@ "TUNNEL_SET_GROUP" : tunnel_set_group ]; } + + // 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) { + newdev["INTERFACETYPE"]=type; + } + NetworkInterfaces::Name = Items[current, "ifcfg"]:""; NetworkInterfaces::Current = newdev; y2internal("%1", newdev); Modified: branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in?rev=64235&r1=64234&r2=64235&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in Mon Jun 6 18:42:30 2011 @@ -7,11 +7,11 @@ BuildRequires: yast2-devtools yast2-testsuite BuildRequires: yast2-country BuildRequires: yast2-installation >= 2.15.27 -# NetworkStorage: adapt functions needed for iBFT (bnc#551380) -BuildRequires: yast2 >= 2.17.82 -# NetworkStorage: adapt functions needed for iBFT (bnc#551380) -Requires: yast2 >= 2.17.82 +# NetworkInterfaces::GetTypeFromIfcfg (bnc#572747) +BuildRequires: yast2 >= 2.17.96 +Requires: yast2 >= 2.17.96 + #netconfig (FaTE #303618) Requires: sysconfig >= 0.71.2 #GetLanguageCountry -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org