Author: mzugec Date: Thu Mar 26 10:50:19 2009 New Revision: 56409 URL: http://svn.opensuse.org/viewcvs/yast?rev=56409&view=rev Log: don't allow to use networkmanager with bridged proposal (bnc#487419) 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=56409&r1=56408&r2=56409&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Mar 26 10:50:19 2009 @@ -1 +1 @@ -2.18.22 +2.18.23 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=56409&r1=56408&r2=56409&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Mar 26 10:50:19 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 26 10:49:19 CET 2009 - mzugec@suse.cz + +- don't allow to use networkmanager with bridged proposal (bnc#487419) +- 2.18.23 + +------------------------------------------------------------------- Tue Mar 24 14:41:57 CET 2009 - mzugec@suse.cz - tun/tap device - don't remove default gw (bnc#483233) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=56409&r1=56408&r2=56409&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Thu Mar 26 10:50:19 2009 @@ -609,7 +609,8 @@ // network mode status_nm = _("Traditional network setup with NetControl - ifup"); // enable NetworkManager applet - link_nm = Hyperlink (href_nm, _("Enable NetworkManager")); + // for virtual network proposal (bridged) don't show hyperlink to enable networkmanager + link_nm = (virt_net_proposal) ? "..." : Hyperlink (href_nm, _("Enable NetworkManager")); } if (ipv6) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org