Mailinglist Archive: yast-commit (725 mails)

[mzugec@xxxxxxxxxxxxxxxx]

Author: mzugec
Date: Mon Aug 17 13:26:04 2009
New Revision: 58363

URL: http://svn.opensuse.org/viewcvs/yast?rev=58363&view=rev
Log:
L3: proposed bridge over bonding (bnc#528076)

Modified:
    trunk/network/VERSION
    trunk/network/src/lan/bridge.ycp

Modified: trunk/network/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=58363&r1=58362&r2=58363&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Mon Aug 17 13:26:04 2009
@@ -1 +1 @@
-2.18.41
+2.18.42

Modified: trunk/network/src/lan/bridge.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/bridge.ycp?rev=58363&r1=58362&r2=58363&view=diff
==============================================================================
--- trunk/network/src/lan/bridge.ycp (original)
+++ trunk/network/src/lan/bridge.ycp Mon Aug 17 13:26:04 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@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx