diff options
Diffstat (limited to 'templates/interfaces/bridge')
8 files changed, 23 insertions, 23 deletions
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index 55c961ba..60af4bc0 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -1,19 +1,19 @@ tag: priority: 310 type: txt -help: Set bridge interface +help: Set bridge interface name +comp_help: "Enter bridge interface name (br0 - br999)" syntax:expression: pattern $VAR(@) "^br[0-9]+$" ; "Must be (br0 - br999)" -create: sudo brctl addbr $VAR(@) - sudo ip link set $VAR(@) up +create: /usr/sbin/brctl addbr $VAR(@) + ip link set $VAR(@) up delete: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ --no-interfaces-assigned \ --bridge-interface="$VAR(@)"; then \ exit 1 fi - sudo ip link set $VAR(@) down; - sudo brctl delbr $VAR(@); + ip link set $VAR(@) down; + /usr/sbin/brctl delbr $VAR(@); -comp_help: "Enter bridge interface name (br0 - br999)" diff --git a/templates/interfaces/bridge/node.tag/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def index 533a8ed5..cd2e5d1a 100644 --- a/templates/interfaces/bridge/node.tag/aging/node.def +++ b/templates/interfaces/bridge/node.tag/aging/node.def @@ -1,7 +1,7 @@ type: u32 help: Set the number of seconds a MAC address will be kept in the forwarding database default: 300 -update:expression: "sudo brctl setageing $VAR(../@) $VAR(@)" -delete:expression: "sudo brctl setageing $VAR(../@) 300" +update: /usr/sbin/brctl setageing $VAR(../@) $VAR(@) +delete: /usr/sbin/brctl setageing $VAR(../@) 300 comp_help: possible completions: <number> Set the number of seconds for ageing (default 300) diff --git a/templates/interfaces/bridge/node.tag/disable/node.def b/templates/interfaces/bridge/node.tag/disable/node.def index 3f37a6d6..2e20be3b 100644 --- a/templates/interfaces/bridge/node.tag/disable/node.def +++ b/templates/interfaces/bridge/node.tag/disable/node.def @@ -1,11 +1,11 @@ help: Disable the bridge interface update: /etc/netplug/linkdown.d/dhclient $VAR(../@) - if ! sudo ip link set $VAR(../@) down 2>/dev/null; then + if ! ip link set $VAR(../@) down 2>/dev/null; then echo "Error disabling dev $VAR(../@)" /etc/netplug/linkup.d/dhclient $VAR(../@) exit 1 fi -delete: if ! sudo ip link set $VAR(../@) up; then +delete: if ! ip link set $VAR(../@) up; then echo "Error enabling dev $VAR(../@)" exit 1 fi diff --git a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def index 458eb320..c273c648 100644 --- a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def +++ b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def @@ -1,5 +1,5 @@ type: u32 help: Set the forwarding delay -update: sudo brctl setfd $VAR(../@) $VAR(@) +update: /usr/sbin/brctl setfd $VAR(../@) $VAR(@) comp_help: possible completions: <number> Set the folwarding delay (default 15) diff --git a/templates/interfaces/bridge/node.tag/hello-time/node.def b/templates/interfaces/bridge/node.tag/hello-time/node.def index 19324a65..8c6ad277 100644 --- a/templates/interfaces/bridge/node.tag/hello-time/node.def +++ b/templates/interfaces/bridge/node.tag/hello-time/node.def @@ -1,8 +1,8 @@ type: u32 help: Set the hello packet advertisment interval default: 2 -update:expression: "sudo brctl sethello $VAR(../@) $VAR(@)" -delete:expression: "sudo brctl sethello $VAR(../@) 2" +update: /usr/sbin/brctl sethello $VAR(../@) $VAR(@) +delete: /usr/sbin/brctl sethello $VAR(../@) 2 comp_help: possible completions: <number> Set the hello packet advertisment interval (default 2) diff --git a/templates/interfaces/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def index ddfdf129..43a9ad04 100644 --- a/templates/interfaces/bridge/node.tag/max-age/node.def +++ b/templates/interfaces/bridge/node.tag/max-age/node.def @@ -1,8 +1,8 @@ type: u32 help: Set the interval at which neighbor bridges are removed default: 20 -update:expression: "sudo brctl setmaxage $VAR(../@) $VAR(@)" -delete:expression: "sudo brctl setmaxage $VAR(../@) 20" +update: /usr/sbin/brctl setmaxage $VAR(../@) $VAR(@) +delete: /usr/sbin/brctl setmaxage $VAR(../@) 20 comp_help: possible completions: <number> Set the max age (default 20) diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def index 1084dbf3..63548d1e 100644 --- a/templates/interfaces/bridge/node.tag/priority/node.def +++ b/templates/interfaces/bridge/node.tag/priority/node.def @@ -1,7 +1,7 @@ type: u32 help: Set the priority for this bridge default: 0 -update:expression: "sudo brctl setbridgeprio $VAR(../@) $VAR(@)" -delete:expression: "sudo brctl setbridgeprio $VAR(../@) 0" +update: /usr/sbin/brctl setbridgeprio $VAR(../@) $VAR(@) +delete: /usr/sbin/brctl setbridgeprio $VAR(../@) 0 comp_help: possible completions: <number> Set bridge priority (default 0) diff --git a/templates/interfaces/bridge/node.tag/stp/node.def b/templates/interfaces/bridge/node.tag/stp/node.def index 6f25f0cc..f3095b26 100644 --- a/templates/interfaces/bridge/node.tag/stp/node.def +++ b/templates/interfaces/bridge/node.tag/stp/node.def @@ -3,16 +3,16 @@ help: Enable spanning tree protocol default: false update: if [ "$VAR(@)" == "true" ]; then if [ -z "$VAR(../../forwarding-delay)" ]; then - sudo brctl setfd $VAR(../@) 15 + /usr/sbin/brctl setfd $VAR(../@) 15 else - sudo brctl setfd $VAR(../@) $VAR(../../forwarding-delay) + /usr/sbin/brctl setfd $VAR(../@) $VAR(../../forwarding-delay) fi - sudo brctl stp $VAR(../@) on + /usr/sbin/brctl stp $VAR(../@) on else - sudo brctl stp $VAR(../@) off - sudo brctl setfd $VAR(../@) 0 + /usr/sbin/brctl stp $VAR(../@) off + /usr/sbin/brctl setfd $VAR(../@) 0 fi -delete:sudo brctl stp $VAR(../@) off +delete:/usr/sbin/brctl stp $VAR(../@) off comp_help: possible completions: true Enable Spanning Tree Protocol false Disable Spanning Tree Protocol (default false) |