diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-08-08 11:08:45 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-08-08 11:08:45 -0500 |
| commit | 11838faf598644c436d5d16c689918503b31185e (patch) | |
| tree | a16fa9092fb1b38f500ffbaaa96ceca434ab90c2 /templates/interfaces | |
| parent | 5a50034c30bf284bcf3cec10dd6c5d14b93e334d (diff) | |
| parent | 08615f465009878cf977f27d72ad1a9d3c8fb80e (diff) | |
| download | vyatta-cfg-system-11838faf598644c436d5d16c689918503b31185e.tar.gz vyatta-cfg-system-11838faf598644c436d5d16c689918503b31185e.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into oxnard
Diffstat (limited to 'templates/interfaces')
| -rw-r--r-- | templates/interfaces/ethernet/node.def | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def index a9113e7a..426f8f87 100644 --- a/templates/interfaces/ethernet/node.def +++ b/templates/interfaces/ethernet/node.def @@ -14,15 +14,10 @@ syntax:expression: exec \ fi" begin: rm -f /tmp/speed-duplex.$VAR(@) - if [ -d "/sys/class/net/$VAR(@)" ]; then - s_mac="$VAR(hw-id/@)" - if [ -n "$VAR(mac/@)" ]; then - s_mac="$VAR(mac/@)" - fi - if [ -n "$s_mac" ]; then + if [ -n "$VAR(mac/@)" ] && + [ -d "/sys/class/net/$VAR(@)" ]; then /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) \ - --set-mac $s_mac - fi + --set-mac "$VAR(mac/@)" fi create: ip link set "$VAR(@)" up |