[netcf-devel] [PATCH 3/3] bridge/bond: propagate MTU of main if to slaves

[David Lutterkort]

If the specification for the toplevel interface mentions an MTU at all,
set it explicitly on all contained interfaces.

When generating interface XML from existing ifcfg-* files, use the MTU
on the main interface as the overall MTU
---
 data/xml/initscripts-get.xsl |    8 +++++---
 tests/initscripts/bridge.xml |    2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/data/xml/initscripts-get.xsl b/data/xml/initscripts-get.xsl
index a8ebd38..8f7aca7 100644
--- a/data/xml/initscripts-get.xsl
+++ b/data/xml/initscripts-get.xsl
@@ -17,6 +17,7 @@
        To keep my sanity, all global variables start with 'g_'
   -->
   <xsl:variable name="g_startmode"
select="/interface/start/@mode"/>
+  <xsl:variable name="g_mtu" select="/interface/mtu/@size"/>
 
   <!--
       Ethernet (physical interface)
@@ -24,7 +25,6 @@
   <xsl:template match="/interface[@type = 'ethernet']">
     <tree>
       <xsl:call-template name="bare-ethernet-interface"/>
-      <xsl:call-template name="mtu"/>
       <xsl:call-template name="interface-addressing"/>
     </tree>
   </xsl:template>
@@ -53,6 +53,7 @@
   <xsl:template name='bare-vlan-interface'>
     <xsl:call-template name='vlan-interface-common'/>
     <xsl:call-template name="startmode"/>
+    <xsl:call-template name="mtu"/>
     <!-- nothing to do for vlan-device -->
   </xsl:template>
 
@@ -134,8 +135,8 @@
   </xsl:template>
 
   <xsl:template name="mtu">
-    <xsl:if test="mtu">
-      <node label="MTU" value="{mtu/@size}"/>
+    <xsl:if test="$g_mtu != ''">
+      <node label="MTU" value="{$g_mtu}"/>
     </xsl:if>
   </xsl:template>
 
@@ -145,6 +146,7 @@
       <node label="HWADDR" value="{mac/@address}"/>
     </xsl:if>
     <xsl:call-template name="startmode"/>
+    <xsl:call-template name="mtu"/>
   </xsl:template>
 
   <xsl:template name="startmode">
diff --git a/tests/initscripts/bridge.xml b/tests/initscripts/bridge.xml
index 330e937..3bfd573 100644
--- a/tests/initscripts/bridge.xml
+++ b/tests/initscripts/bridge.xml
@@ -15,11 +15,13 @@
     <node label="DEVICE" value="eth0"/>
     <node label="HWADDR" value="ab:bb:cc:dd:ee:ff"/>
     <node label="ONBOOT" value="yes"/>
+    <node label="MTU" value="1500"/>
     <node label="BRIDGE" value="br0"/>
   </tree>
   <tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth1">
     <node label="DEVICE" value="eth1"/>
     <node label="ONBOOT" value="yes"/>
+    <node label="MTU" value="1500"/>
     <node label="BRIDGE" value="br0"/>
   </tree>
 </forest>
-- 
1.6.0.6