It makes no sense on bridges, and until it's clear whether it makes
sense on bonds, we disallow it
---
data/xml/initscripts-get.xsl | 3 +--
data/xml/initscripts-put.xsl | 2 --
data/xml/interface.rng | 3 +--
tests/initscripts/bridge.xml | 1 -
tests/initscripts/ethernet-dhcp.xml | 2 +-
tests/interface/bridge.xml | 3 ---
tests/test-initscripts.c | 3 ++-
7 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/data/xml/initscripts-get.xsl b/data/xml/initscripts-get.xsl
index acf5752..a8ebd38 100644
--- a/data/xml/initscripts-get.xsl
+++ b/data/xml/initscripts-get.xsl
@@ -24,6 +24,7 @@
<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>
@@ -51,7 +52,6 @@
<xsl:template name='bare-vlan-interface'>
<xsl:call-template name='vlan-interface-common'/>
- <xsl:call-template name="mtu"/>
<xsl:call-template name="startmode"/>
<!-- nothing to do for vlan-device -->
</xsl:template>
@@ -144,7 +144,6 @@
<xsl:if test="mac">
<node label="HWADDR" value="{mac/@address}"/>
</xsl:if>
- <xsl:call-template name="mtu"/>
<xsl:call-template name="startmode"/>
</xsl:template>
diff --git a/data/xml/initscripts-put.xsl b/data/xml/initscripts-put.xsl
index 4d3f30b..88092a1 100644
--- a/data/xml/initscripts-put.xsl
+++ b/data/xml/initscripts-put.xsl
@@ -47,7 +47,6 @@
<xsl:variable name="name" select="node[@label =
'DEVICE']/@value"/>
<interface type="vlan">
<xsl:call-template name="name-attr"/>
- <xsl:call-template name="mtu"/>
<xsl:call-template name="vlan-device"/>
</interface>
</xsl:template>
@@ -207,7 +206,6 @@
<xsl:if test="node[@label = 'HWADDR']">
<mac address="{node[@label = 'HWADDR']/@value}"/>
</xsl:if>
- <xsl:call-template name="mtu"/>
</interface>
</xsl:template>
</xsl:stylesheet>
diff --git a/data/xml/interface.rng b/data/xml/interface.rng
index ffaa404..8a45480 100644
--- a/data/xml/interface.rng
+++ b/data/xml/interface.rng
@@ -33,7 +33,6 @@
<attribute name="address"><ref
name="mac-addr"/></attribute>
</element>
</optional>
- <ref name="mtu"/>
<!-- FIXME: Allow (some) ethtool options -->
</define>
@@ -48,6 +47,7 @@
<element name="interface">
<ref name="startmode"/>
<ref name="basic-ethernet-content"/>
+ <ref name="mtu"/>
<ref name="interface-addressing"/>
</element>
</define>
@@ -77,7 +77,6 @@
<define name="bare-vlan-interface">
<element name="interface">
<ref name="vlan-interface-common"/>
- <ref name="mtu"/>
<ref name="vlan-device"/>
</element>
</define>
diff --git a/tests/initscripts/bridge.xml b/tests/initscripts/bridge.xml
index f624965..330e937 100644
--- a/tests/initscripts/bridge.xml
+++ b/tests/initscripts/bridge.xml
@@ -14,7 +14,6 @@
<tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
<node label="DEVICE" value="eth0"/>
<node label="HWADDR" value="ab:bb:cc:dd:ee:ff"/>
- <node label="MTU" value="1492"/>
<node label="ONBOOT" value="yes"/>
<node label="BRIDGE" value="br0"/>
</tree>
diff --git a/tests/initscripts/ethernet-dhcp.xml b/tests/initscripts/ethernet-dhcp.xml
index 8233509..6ce4b2f 100644
--- a/tests/initscripts/ethernet-dhcp.xml
+++ b/tests/initscripts/ethernet-dhcp.xml
@@ -6,8 +6,8 @@
<tree path="/files/etc/sysconfig/network-scripts/ifcfg-eth0">
<node label="DEVICE" value="eth0"/>
<node label="HWADDR" value="aa:bb:cc:dd:ee:ff"/>
- <node label="MTU" value="1492"/>
<node label="ONBOOT" value="no"/>
+ <node label="MTU" value="1492"/>
<node label="BOOTPROTO" value="dhcp"/>
<node label="PEERDNS" value="no"/>
</tree>
diff --git a/tests/interface/bridge.xml b/tests/interface/bridge.xml
index e309060..fb0c35b 100644
--- a/tests/interface/bridge.xml
+++ b/tests/interface/bridge.xml
@@ -6,10 +6,7 @@
</protocol>
<bridge stp="off">
<interface type="ethernet" name="eth0">
- <!-- FIXME: is it reasonable to alllow separate MTU's for bridge and
- enslaved if ? -->
<mac address="ab:bb:cc:dd:ee:ff"/>
- <mtu size="1492"/>
</interface>
<interface type="ethernet" name="eth1"/>
</bridge>
diff --git a/tests/test-initscripts.c b/tests/test-initscripts.c
index d7bc781..d7f27fe 100644
--- a/tests/test-initscripts.c
+++ b/tests/test-initscripts.c
@@ -161,7 +161,8 @@ static void assert_xml_equals(CuTest *tc, const char *fname,
xmlFreeDoc(act_doc);
if (! result) {
- format_error(&msg, "%s: %s", fname, err);
+ format_error(&msg, "%s: %s\nExpected XML:\n%s\nActual XML:\n%s\n",
+ fname, err, exp, act);
CuFail(tc, msg);
}
}
--
1.6.0.6