summaryrefslogtreecommitdiff
path: root/templates/interfaces/ethernet/node.def
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-08-15 13:30:17 -0500
committerJohn Southworth <john.southworth@vyatta.com>2011-08-15 13:30:17 -0500
commit36300ab43d8aa33506ea1ce30fc32dd25dbeb7e7 (patch)
tree8fab386c84c3bf9ba51b96f9395af7b8dff1d417 /templates/interfaces/ethernet/node.def
parentd1d15b68a50d9374dfe763e130887f2a0372bf66 (diff)
parent80a97b5e4ce2530db696e3cb294d35d9678934b7 (diff)
downloadvyatta-cfg-quagga-36300ab43d8aa33506ea1ce30fc32dd25dbeb7e7.tar.gz
vyatta-cfg-quagga-36300ab43d8aa33506ea1ce30fc32dd25dbeb7e7.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into oxnard
Diffstat (limited to 'templates/interfaces/ethernet/node.def')
-rw-r--r--templates/interfaces/ethernet/node.def4
1 files changed, 3 insertions, 1 deletions
diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def
index 426f8f87..45d6ec09 100644
--- a/templates/interfaces/ethernet/node.def
+++ b/templates/interfaces/ethernet/node.def
@@ -20,7 +20,9 @@ begin: rm -f /tmp/speed-duplex.$VAR(@)
--set-mac "$VAR(mac/@)"
fi
-create: ip link set "$VAR(@)" up
+create: if ! cli-shell-api exists interfaces ethernet $VAR(@) disable;
+ then ip link set $VAR(@) up
+ fi
/opt/vyatta/sbin/vyatta-link-detect $VAR(@) on
delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0