From 8a66041f90db8205db50fd83aed8001175c787ed Mon Sep 17 00:00:00 2001 From: slioch Date: Mon, 2 Mar 2009 22:28:16 -0800 Subject: added fix for nested priority and deletion failure. also priorities should not reside on node.tags, but on parent (node name of multinode)--this is to prevent priorities splitting behaviors between different priorities on multinodes. --- templates/priority | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'templates') diff --git a/templates/priority b/templates/priority index fe4babd..8b8118a 100644 --- a/templates/priority +++ b/templates/priority @@ -4,21 +4,21 @@ 301 protocols/ospfv3 302 protocols/rip 303 protocols/ripng -310 interfaces/bridge/node.tag -320 interfaces/ethernet/node.tag -320 interfaces/loopback/node.tag -330 interfaces/adsl/node.tag -340 interfaces/serial/node.tag -350 interfaces/wirelessmodem/node.tag -380 interfaces/tunnel/node.tag -380 interfaces/openvpn/node.tag -390 interfaces/bonding/node.tag +310 interfaces/bridge +320 interfaces/ethernet +320 interfaces/loopback +330 interfaces/adsl +340 interfaces/serial +350 interfaces/wirelessmodem +380 interfaces/tunnel +380 interfaces/openvpn +390 interfaces/bonding 400 system 450 protocols/static 470 policy -500 protocols/bgp/node.tag +500 protocols/bgp 510 protocols/bgp/node.tag/parameters -520 protocols/bgp/node.tag/neighbor/node.tag +520 protocols/bgp/node.tag/neighbor 530 protocols/bgp/node.tag/ipv6 530 protocols/bgp/node.tag/network 530 protocols/bgp/node.tag/redistribute -- cgit v1.2.3 From a6316a2b0f98b50b2f36bfa440b8dd432df98131 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 3 Mar 2009 08:23:29 -0800 Subject: Use vyatta-interfaces to generate allowed list --- templates/interfaces/ethernet/node.def | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def index 1886458..55d0a85 100644 --- a/templates/interfaces/ethernet/node.def +++ b/templates/interfaces/ethernet/node.def @@ -8,12 +8,7 @@ syntax:expression: exec " \ echo \"Ethernet interface does not exist: $VAR(@)\"; \ exit 1; \ fi" - +allowed: /opt/vyatt/sbin/vyatta-interfaces.pl --show=ethernet update: sudo ip link set "$VAR(@)" up /opt/vyatta/sbin/vyatta-link-detect $VAR(@) on delete: sudo ip link set "$VAR(@)" down -allowed: for dev in /sys/class/net/eth*; - do if [[ -d $dev && -L $dev/device ]] - then echo -n ${dev##*/} " " - fi - done -- cgit v1.2.3 From 76df8018fe0f0648abc58bd7a988ffaf61e75106 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 3 Mar 2009 08:42:36 -0800 Subject: Use check option to vyatta-interfaces.pl Eliminate checks in template in favor of doing it in one place in vyatta-interfaces.pl code. --- templates/interfaces/ethernet/node.def | 11 +++-------- templates/interfaces/loopback/node.def | 13 +++---------- 2 files changed, 6 insertions(+), 18 deletions(-) (limited to 'templates') diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def index 55d0a85..c231b74 100644 --- a/templates/interfaces/ethernet/node.def +++ b/templates/interfaces/ethernet/node.def @@ -1,14 +1,9 @@ tag: type: txt help: Set ethernet interface -syntax:expression: pattern $VAR(@) "^eth[0-9]+$" \ - ; "interface must be (eth0 - eth999)" -syntax:expression: exec " \ - if [ -f /sys/class/net/$VAR(@) ]; then \ - echo \"Ethernet interface does not exist: $VAR(@)\"; \ - exit 1; \ - fi" -allowed: /opt/vyatt/sbin/vyatta-interfaces.pl --show=ethernet +syntax:expression: exec \ + "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=ethernet" +allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet update: sudo ip link set "$VAR(@)" up /opt/vyatta/sbin/vyatta-link-detect $VAR(@) on delete: sudo ip link set "$VAR(@)" down diff --git a/templates/interfaces/loopback/node.def b/templates/interfaces/loopback/node.def index e57f4b1..690dc39 100644 --- a/templates/interfaces/loopback/node.def +++ b/templates/interfaces/loopback/node.def @@ -1,14 +1,7 @@ tag: type: txt help: Set loopback interface -allowed: echo "lo" -syntax:expression: exec "\ - if [ ! -d /sys/class/net/$VAR(@) ]; then \ - echo \"loopback interface $VAR(@) does not exist\"; \ - exit 1; \ - elif [ $(cat /sys/class/net/$VAR(@)/type) -ne 772 ]; then \ - echo \"interface $VAR(@) is not a loopback interface\"; \ - exit 1; \ - fi" - +syntax:expression: exec \ + "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=loopback" +allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=loopback update: sudo ip link set $VAR(@) up -- cgit v1.2.3 From f30e5be6b720de55f2c06d640b594d9d3457e102 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 3 Mar 2009 08:43:22 -0800 Subject: Need to setup bonding before ethernet --- templates/priority | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/priority b/templates/priority index 8b8118a..3ba0cd6 100644 --- a/templates/priority +++ b/templates/priority @@ -5,6 +5,7 @@ 302 protocols/rip 303 protocols/ripng 310 interfaces/bridge +315 interfaces/bonding 320 interfaces/ethernet 320 interfaces/loopback 330 interfaces/adsl @@ -12,7 +13,6 @@ 350 interfaces/wirelessmodem 380 interfaces/tunnel 380 interfaces/openvpn -390 interfaces/bonding 400 system 450 protocols/static 470 policy -- cgit v1.2.3