Author: mzugec Date: Thu Mar 26 10:53:49 2009 New Revision: 56412 URL: http://svn.opensuse.org/viewcvs/yast?rev=56412&view=rev Log: don't allow to use networkmanager with bridged proposal (bnc#487419) Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes branches/tmp/SLE-11-SP1-Stash/network/src/modules/Lan.ycp Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/VERSION?rev=56412&r1=56411&r2=56412&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/network/VERSION Thu Mar 26 10:53:49 2009 @@ -1 +1 @@ -2.17.85 +2.17.86 Modified: branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes?rev=56412&r1=56411&r2=56412&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes Thu Mar 26 10:53:49 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 26 10:53:19 CET 2009 - mzugec@suse.cz + +- don't allow to use networkmanager with bridged proposal (bnc#487419) +- 2.17.86 + +------------------------------------------------------------------- Mon Mar 23 21:20:12 CET 2009 - mzugec@suse.de - fixed firewall checkbox status for dsl and modem (bnc#404359) Modified: branches/tmp/SLE-11-SP1-Stash/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/src/modules/Lan.ycp?rev=56412&r1=56411&r2=56412&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/src/modules/Lan.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/network/src/modules/Lan.ycp Thu Mar 26 10:53:49 2009 @@ -638,7 +638,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