Author: mzugec Date: Thu Apr 23 21:48:01 2009 New Revision: 56954 URL: http://svn.opensuse.org/viewcvs/yast?rev=56954&view=rev Log: don't propose bridged network for WLAN devices (bnc#450670) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=56954&r1=56953&r2=56954&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Apr 23 21:48:01 2009 @@ -1 +1 @@ -2.18.27 +2.18.28 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=56954&r1=56953&r2=56954&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Apr 23 21:48:01 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 23 21:46:28 CEST 2009 - mzugec@suse.cz + +- don't propose bridged network for WLAN devices (bnc#450670) +- 2.18.28 + +------------------------------------------------------------------- Thu Apr 9 14:05:51 CEST 2009 - mzugec@suse.de - fixed netmask/prefixlen validation and correct write (bnc#493222) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=56954&r1=56953&r2=56954&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Thu Apr 23 21:48:01 2009 @@ -767,10 +767,15 @@ foreach (integer number, any lanitem, LanItems::Items, { if (hasAnyValue(((map)lanitem)["hwinfo", "dev_name"]:"")) { LanItems::current = number; - boolean link = LanItems::getCurrentItem()["hwinfo", "link"]:false == true; - if (!link) y2warning("item number %1 has link:false detected", number); - if (!LanItems::IsItemConfigured() && link){ - y2milestone("Nothing already configured - start proposing"); + boolean valid = LanItems::getCurrentItem()["hwinfo", "link"]:false == true; + if (!valid) y2warning("item number %1 has link:false detected", number); + // don't propose WLAN interface (bnc#450670) + else if (LanItems::getCurrentItem()["hwinfo", "type"]:""=="wlan"){ + y2warning("not proposing WLAN interface"); + valid = false; + } + if (!LanItems::IsItemConfigured() && valid){ + y2milestone("Not configured - start proposing"); LanItems::ProposeItem(); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org