diff options
Diffstat (limited to 'templates/interfaces/bridge')
8 files changed, 18 insertions, 18 deletions
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index c20b361c..8525cb9e 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -5,7 +5,7 @@ help: Bridge interface name val_help: <brN>; Bridge interface name syntax:expression: pattern $VAR(@) "^br[0-9]+$" ; "Must be (br0 - br999)" -create: /usr/sbin/brctl addbr $VAR(@) +create: /sbin/brctl addbr $VAR(@) if [ -n "$VAR(mac/@)" ] ; then ip li set dev $VAR(@) address $VAR(mac/@) fi @@ -17,4 +17,4 @@ delete: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ exit 1 fi ip link set $VAR(@) down; - /usr/sbin/brctl delbr $VAR(@); + /sbin/brctl delbr $VAR(@); diff --git a/templates/interfaces/bridge/node.tag/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def index a67a7ca3..ab83140f 100644 --- a/templates/interfaces/bridge/node.tag/aging/node.def +++ b/templates/interfaces/bridge/node.tag/aging/node.def @@ -6,5 +6,5 @@ syntax:expression: $VAR(@) == 0 || ( $VAR(@) >= 10 && $VAR(@) < 1000000 ) ; val_help: 0; Disable retaining address in bridge (always flood) val_help: u32:10-1000000; Address aging time for bridge seconds (default 300) -update: /usr/sbin/brctl setageing $VAR(../@) $VAR(@) -delete: /usr/sbin/brctl setageing $VAR(../@) 300 +update: /sbin/brctl setageing $VAR(../@) $VAR(@) +delete: /sbin/brctl setageing $VAR(../@) 300 diff --git a/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def b/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def index 225bd926..d25533f9 100644 --- a/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def @@ -27,7 +27,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def index 21de2454..7783339b 100644 --- a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def +++ b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def @@ -2,4 +2,4 @@ type: u32 help: Forwarding delay syntax:expression:$VAR(@) <= 200; "Forwarding delay must be between 0 and 200" val_help: u32:0-200; Spanning Tree Protocol forwarding delay in seconds (default 15) -update: /usr/sbin/brctl setfd $VAR(../@) $VAR(@) +update: /sbin/brctl setfd $VAR(../@) $VAR(@) diff --git a/templates/interfaces/bridge/node.tag/hello-time/node.def b/templates/interfaces/bridge/node.tag/hello-time/node.def index 8f48b8be..f6d54d73 100644 --- a/templates/interfaces/bridge/node.tag/hello-time/node.def +++ b/templates/interfaces/bridge/node.tag/hello-time/node.def @@ -3,5 +3,5 @@ default: 2 help: Hello packet advertisment interval syntax:expression: $VAR(@) <= 30; "Bridge Hello interval must be between 0 and 30 seconds" val_help: u32:0-30; Spanning Tree Protocol hello advertisement interval (default 2) -update: /usr/sbin/brctl sethello $VAR(../@) $VAR(@) -delete: /usr/sbin/brctl sethello $VAR(../@) 2 +update: /sbin/brctl sethello $VAR(../@) $VAR(@) +delete: /sbin/brctl sethello $VAR(../@) 2 diff --git a/templates/interfaces/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def index b30e5e9e..452313ad 100644 --- a/templates/interfaces/bridge/node.tag/max-age/node.def +++ b/templates/interfaces/bridge/node.tag/max-age/node.def @@ -5,6 +5,6 @@ syntax:expression: $VAR(@) >= 6 && $VAR(@) <= 200 ; "Bridge max aging value must be between 6 and 200" val_help: u32:6-200; Bridge maximum aging time value (default 20) -update: /usr/sbin/brctl setmaxage $VAR(../@) $VAR(@) -delete: /usr/sbin/brctl setmaxage $VAR(../@) 20 +update: /sbin/brctl setmaxage $VAR(../@) $VAR(@) +delete: /sbin/brctl setmaxage $VAR(../@) 20 diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def index ba17f841..3e35dc67 100644 --- a/templates/interfaces/bridge/node.tag/priority/node.def +++ b/templates/interfaces/bridge/node.tag/priority/node.def @@ -4,5 +4,5 @@ default: 32768 syntax:expression:$VAR(@) < 65536 ; "Bridge priority must be between 0 and 65535 (multiples of 4096)" val_help: u32:0-65535; Bridge priority (default 32768) -update: /usr/sbin/brctl setbridgeprio $VAR(../@) $VAR(@) -delete: /usr/sbin/brctl setbridgeprio $VAR(../@) 32768 +update: /sbin/brctl setbridgeprio $VAR(../@) $VAR(@) +delete: /sbin/brctl setbridgeprio $VAR(../@) 32768 diff --git a/templates/interfaces/bridge/node.tag/stp/node.def b/templates/interfaces/bridge/node.tag/stp/node.def index d24a3261..63000648 100644 --- a/templates/interfaces/bridge/node.tag/stp/node.def +++ b/templates/interfaces/bridge/node.tag/stp/node.def @@ -6,13 +6,13 @@ val_help: false; Disable Spanning Tree Protocol (default) update: if [ "$VAR(@)" == "true" ]; then if [ -z "$VAR(../../forwarding-delay)" ]; then - /usr/sbin/brctl setfd $VAR(../@) 15 + /sbin/brctl setfd $VAR(../@) 15 else - /usr/sbin/brctl setfd $VAR(../@) $VAR(../../forwarding-delay) + /sbin/brctl setfd $VAR(../@) $VAR(../../forwarding-delay) fi - /usr/sbin/brctl stp $VAR(../@) on + /sbin/brctl stp $VAR(../@) on else - /usr/sbin/brctl stp $VAR(../@) off - /usr/sbin/brctl setfd $VAR(../@) 0 + /sbin/brctl stp $VAR(../@) off + /sbin/brctl setfd $VAR(../@) 0 fi -delete:/usr/sbin/brctl stp $VAR(../@) off +delete:/sbin/brctl stp $VAR(../@) off |