summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-11-30 16:41:36 -0800
committerJohn Southworth <john.southworth@vyatta.com>2011-11-30 16:41:36 -0800
commitc442609ad1696e252d4552ad16f909fb79e703c2 (patch)
treeccb0c7115198e5470665bbe244e5d0b0f3f17ec8 /templates
parenta9d3f4488556d9b0f7807045ff523e30f33f017a (diff)
parent63a41afb346d7ed60db576ecb7b2d938bcfac10a (diff)
downloadvyatta-cfg-system-c442609ad1696e252d4552ad16f909fb79e703c2.tar.gz
vyatta-cfg-system-c442609ad1696e252d4552ad16f909fb79e703c2.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into changes-john-southworth
Diffstat (limited to 'templates')
-rw-r--r--templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def1
-rw-r--r--templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/disable-flow-control/node.def4
3 files changed, 4 insertions, 2 deletions
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def
new file mode 100644
index 00000000..03f22d28
--- /dev/null
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def
@@ -0,0 +1 @@
+help: Configure a virtual MAC interface
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def
new file mode 100644
index 00000000..03f22d28
--- /dev/null
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def
@@ -0,0 +1 @@
+help: Configure a virtual MAC interface
diff --git a/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def b/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def
index 702e1d29..ef62b4e1 100644
--- a/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def
@@ -2,7 +2,7 @@ priority: 320 # Must run after interface is configured.
help: Disable Ethernet flow control (pause frames)
-create: sudo ethtool --pause $VAR(../@) autoneg off tx off rx off
+create: ethtool --pause $VAR(../@) autoneg off tx off rx off
delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0
- sudo ethtool --pause $VAR(../@) autoneg on tx on rx on
+ ethtool --pause $VAR(../@) autoneg on tx on rx on