diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2011-05-07 10:32:10 +0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2011-05-10 09:33:37 +0800 |
| commit | b517c1438fc6930e9d20eac507aaa3cdbc8c3b4e (patch) | |
| tree | 2ceb8ce76d86ccd4934fdc91c1978ac9a51d1bcd /templates | |
| parent | c2174e6faaee38665e9ddff0d6ddd2ddd4921c11 (diff) | |
| download | vyatta-cfg-quagga-b517c1438fc6930e9d20eac507aaa3cdbc8c3b4e.tar.gz vyatta-cfg-quagga-b517c1438fc6930e9d20eac507aaa3cdbc8c3b4e.zip | |
more changes for new commit
(cherry picked from commit 11baf27c6caf1a0edf2b993fb7066227d02eab7b)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/interfaces/ethernet/node.def | 8 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/mac/node.def | 5 | ||||
| -rw-r--r-- | templates/system/ipv6/blacklist/node.def | 1 | ||||
| -rw-r--r-- | templates/system/ipv6/disable-forwarding/node.def | 1 | ||||
| -rw-r--r-- | templates/system/ipv6/disable/node.def | 1 | ||||
| -rw-r--r-- | templates/system/ipv6/neighbor/node.def | 1 | ||||
| -rw-r--r-- | templates/system/ipv6/node.def | 1 |
7 files changed, 12 insertions, 6 deletions
diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def index 31883c64..0b55de8a 100644 --- a/templates/interfaces/ethernet/node.def +++ b/templates/interfaces/ethernet/node.def @@ -14,6 +14,14 @@ syntax:expression: exec \ fi" begin: rm -f /tmp/speed-duplex.$VAR(@) + if [ -d "/sys/class/net/$VAR(@)" ]; then + # assume hw-id always exists (as orig impl did) + s_mac="$VAR(hw-id/@)" + if [ -n "$VAR(mac/@)" ]; then + s_mac="$VAR(mac/@)" + fi + /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) --set-mac $s_mac + fi create: ip link set "$VAR(@)" up /opt/vyatta/sbin/vyatta-link-detect $VAR(@) on diff --git a/templates/interfaces/ethernet/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/mac/node.def index c9fbb0fe..5b797830 100644 --- a/templates/interfaces/ethernet/node.tag/mac/node.def +++ b/templates/interfaces/ethernet/node.tag/mac/node.def @@ -1,9 +1,4 @@ type: macaddr -priority: 317 # must be set before dhcp client help: Media Access Control (MAC) address syntax:expression: exec "\ /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)" -update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@) -delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0 - /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(../hw-id/@) - diff --git a/templates/system/ipv6/blacklist/node.def b/templates/system/ipv6/blacklist/node.def index ce8dafd1..081425bd 100644 --- a/templates/system/ipv6/blacklist/node.def +++ b/templates/system/ipv6/blacklist/node.def @@ -1,3 +1,4 @@ +priority: 400 help: Prevent the IPv6 kernel module from being loaded create: diff --git a/templates/system/ipv6/disable-forwarding/node.def b/templates/system/ipv6/disable-forwarding/node.def index 4d374455..10357338 100644 --- a/templates/system/ipv6/disable-forwarding/node.def +++ b/templates/system/ipv6/disable-forwarding/node.def @@ -1,3 +1,4 @@ +priority: 400 help: Disable IPv6 forwarding on all interfaces # Disable IPv6 forwarding for all interfaces we currently have, diff --git a/templates/system/ipv6/disable/node.def b/templates/system/ipv6/disable/node.def index be1ce2f5..eb61557f 100644 --- a/templates/system/ipv6/disable/node.def +++ b/templates/system/ipv6/disable/node.def @@ -1,3 +1,4 @@ +priority: 400 help: Disable assignment of IPv6 addresses on all interfaces create: diff --git a/templates/system/ipv6/neighbor/node.def b/templates/system/ipv6/neighbor/node.def index ed434588..ca609636 100644 --- a/templates/system/ipv6/neighbor/node.def +++ b/templates/system/ipv6/neighbor/node.def @@ -1 +1,2 @@ +priority: 400 help: Parameters for Neighbor cache diff --git a/templates/system/ipv6/node.def b/templates/system/ipv6/node.def index 4801c82d..d67a124a 100644 --- a/templates/system/ipv6/node.def +++ b/templates/system/ipv6/node.def @@ -1,2 +1 @@ -priority: 400 help: IPv6 settings |