Author: mzugec Date: Fri Dec 17 10:59:53 2010 New Revision: 63004 URL: http://svn.opensuse.org/viewcvs/yast?rev=63004&view=rev Log: L3: don't propose bridge for vbox (bnc#648044) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_proposal.ycp trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=63004&r1=63003&r2=63004&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Dec 17 10:59:53 2010 @@ -1 +1 @@ -2.20.7 +2.20.8 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=63004&r1=63003&r2=63004&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Dec 17 10:59:53 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 17 10:57:38 CET 2010 - mzugec@suse.cz + +- L3: don't propose bridge for vbox (bnc#648044) +- 2.20.8 + +------------------------------------------------------------------- Mon Dec 6 16:13:04 CET 2010 - mzugec@suse.cz - L3: AY Layer2 support - fixed portname option (bnc#573607) Modified: trunk/network/src/clients/lan_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_proposal.ycp?rev=63004&r1=63003&r2=63004&view=diff ============================================================================== --- trunk/network/src/clients/lan_proposal.ycp (original) +++ trunk/network/src/clients/lan_proposal.ycp Fri Dec 17 10:59:53 2010 @@ -52,7 +52,7 @@ Lan::Read (force_reset? `nocache: `cache); if (Lan::virt_net_proposal==nil){ if((PackageSystem::Installed("xen") && !Arch::is_xenU()) || PackageSystem::Installed("kvm")|| - PackageSystem::Installed("qemu") || PackageSystem::Installed("virtualbox-ose")) + PackageSystem::Installed("qemu")) Lan::virt_net_proposal = true; else Lan::virt_net_proposal = false; } Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=63004&r1=63003&r2=63004&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Fri Dec 17 10:59:53 2010 @@ -712,8 +712,9 @@ // enable ipv6 support link_v6 = Hyperlink (href_v6, _("Enable IPv6")); } + // no exception needed for virtualbox* (bnc#648044) http://www.virtualbox.org/manual/ch06.html if ( (PackageSystem::Installed("xen") && !Arch::is_xenU()) || PackageSystem::Installed("kvm")|| - PackageSystem::Installed("qemu")||PackageSystem::Installed("virtualbox-ose") + PackageSystem::Installed("qemu") ){ if (virt_net_proposal){ href_virt_net = "virtual-revert"; @@ -838,7 +839,7 @@ // test if we have any virtualization installed if (virt_net_proposal) { - y2milestone("Virtualization [xen|kvm|qemu|virtualbox-ose] detected - will propose virtualization network"); + y2milestone("Virtualization [xen|kvm|qemu] detected - will propose virtualization network"); // in case of virtualization use special proposal // collect all interfaces that will be skipped from bridged proposal list<string> skipped = []; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org