Author: mzugec Date: Mon Aug 17 13:31:31 2009 New Revision: 58365 URL: http://svn.opensuse.org/viewcvs/yast?rev=58365&view=rev Log: L3: manually created bridge over bonding (bnc#528074) 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/lan/bridge.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=58365&r1=58364&r2=58365&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/network/VERSION Mon Aug 17 13:31:31 2009 @@ -1 +1 @@ -2.17.97 +2.17.98 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=58365&r1=58364&r2=58365&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 Mon Aug 17 13:31:31 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 17 13:30:40 CEST 2009 - mzugec@suse.de + +- L3: manually created bridge over bonding (bnc#528074) +- 2.17.98 + +------------------------------------------------------------------- Mon Aug 17 11:36:33 CEST 2009 - mzugec@suse.de - L3: proposed bridge over bonding (bnc#528076) Modified: branches/tmp/SLE-11-SP1-Stash/network/src/lan/bridge.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/src/lan/bridge.ycp?rev=58365&r1=58364&r2=58365&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/src/lan/bridge.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/network/src/lan/bridge.ycp Mon Aug 17 13:31:31 2009 @@ -57,7 +57,19 @@ if (contains(sel, device) && hasAnyValue(device)) { if (contains(confs, device)){ // allow to add bonding device into bridge and also device with mask /32(bnc#405343) - if (contains(["tun", "tap", "bond"], NetworkInterfaces::GetType(device))) continue; + if (contains(["tun", "tap"], NetworkInterfaces::GetType(device))) continue; + if (contains(["bond"], NetworkInterfaces::GetType(device))) { + if (LanItems::operation==`add){ + string old_name = NetworkInterfaces::Name; + NetworkInterfaces::Edit(device); + NetworkInterfaces::Current["IPADDR"]="0.0.0.0"; + NetworkInterfaces::Current["NETMASK"]="255.255.255.255"; + NetworkInterfaces::Current["BOOTPROTO"]="static"; + NetworkInterfaces::Commit(); + NetworkInterfaces::Add(); + } + continue; + } if (((string)configurations[NetworkInterfaces::GetType(device), device, "PREFIXLEN"]:"" != "32") || ((string)configurations[NetworkInterfaces::GetType(device), device, "NETMASK"]:"" != "255.255.255.255")) if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0") { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org