[yast-commit] r52729 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Lan.ycp src/modules/NetHwDetection.ycp
Author: mzugec Date: Thu Oct 30 12:19:20 2008 New Revision: 52729 URL: http://svn.opensuse.org/viewcvs/yast?rev=52729&view=rev Log: for bridged proposal skip devices with no ifcfg (bnc#440132) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp trunk/network/src/modules/NetHwDetection.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=52729&r1=52728&r2=52729&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Oct 30 12:19:20 2008 @@ -1 +1 @@ -2.17.47 +2.17.48 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=52729&r1=52728&r2=52729&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Oct 30 12:19:20 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 30 10:38:26 CET 2008 - mzugec@suse.de + +- for bridged proposal skip devices with no ifcfg (bnc#440132) +- 2.14.48 + +------------------------------------------------------------------- Thu Oct 30 10:32:12 CET 2008 - mzugec@suse.de - address dialog layout (bnc#439100) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=52729&r1=52728&r2=52729&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Thu Oct 30 12:19:20 2008 @@ -780,27 +780,29 @@ // and add old device name into bridge_ports foreach(integer current, any config, LanItems::Items, { string ifcfg = LanItems::Items[current, "ifcfg"]:""; - if (! (NetworkInterfaces::GetType(ifcfg)=="br")){ - NetworkInterfaces::Edit(ifcfg); - string new_ifcfg = sformat("br%1", NetworkInterfaces::GetFreeDevice("br")); - y2milestone("old configuration %1, bridge %2", ifcfg, new_ifcfg); - NetworkInterfaces::Name = new_ifcfg; - NetworkInterfaces::Current["BRIDGE"]="yes"; - NetworkInterfaces::Current["BRIDGE_PORTS"]=ifcfg; - // remove description - will be replaced by new (real) one - NetworkInterfaces::Current=remove(NetworkInterfaces::Current, "NAME"); - if( NetworkInterfaces::Commit() ){ - NetworkInterfaces::Delete(ifcfg); - NetworkInterfaces::Commit(); - - LanItems::Items[current, "ifcfg"] = new_ifcfg; - LanItems::modified=true; - LanItems::force_restart=true; - y2internal("List %1", NetworkInterfaces::List("")); - // re-read configuration to see new items in UI - LanItems::Read(); - } else y2error("error while proposing bridge device for %1", ifcfg); - } else y2internal("skipping bridge ..."); + if (size(ifcfg)>0){ + if (! (NetworkInterfaces::GetType(ifcfg)=="br")){ + NetworkInterfaces::Edit(ifcfg); + string new_ifcfg = sformat("br%1", NetworkInterfaces::GetFreeDevice("br")); + y2milestone("old configuration %1, bridge %2", ifcfg, new_ifcfg); + NetworkInterfaces::Name = new_ifcfg; + NetworkInterfaces::Current["BRIDGE"]="yes"; + NetworkInterfaces::Current["BRIDGE_PORTS"]=ifcfg; + // remove description - will be replaced by new (real) one + NetworkInterfaces::Current=remove(NetworkInterfaces::Current, "NAME"); + if( NetworkInterfaces::Commit() ){ + NetworkInterfaces::Delete(ifcfg); + NetworkInterfaces::Commit(); + + LanItems::Items[current, "ifcfg"] = new_ifcfg; + LanItems::modified=true; + LanItems::force_restart=true; + y2internal("List %1", NetworkInterfaces::List("")); + // re-read configuration to see new items in UI + LanItems::Read(); + } else y2error("error while proposing bridge device for %1", ifcfg); + } else y2internal("skipping bridge ..."); + } else y2warning("empty ifcfg"); }); } else { Modified: trunk/network/src/modules/NetHwDetection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetHwDetection.ycp?rev=52729&r1=52728&r2=52729&view=diff ============================================================================== --- trunk/network/src/modules/NetHwDetection.ycp (original) +++ trunk/network/src/modules/NetHwDetection.ycp Thu Oct 30 12:19:20 2008 @@ -126,7 +126,7 @@ // { y2milestone("Setting link up for interface %1", ifc); SCR::Execute(.target.bash, sformat("ip link set %1 up", ifc)); -// } else y2milestone("Link for %1 interface is already up, do nothing", ifc); +// } else y2milestone("Link for %1 interface is already up, nothing to do", ifc); }); } else y2error("Error while execute %1 : %2", command, output); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
mzugec@svn.opensuse.org