diff options
11 files changed, 49 insertions, 49 deletions
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/bridge-group/node.def index 940295fa..9ce97b1b 100644 --- a/templates/interfaces/bonding/node.tag/bridge-group/node.def +++ b/templates/interfaces/bonding/node.tag/bridge-group/node.def @@ -12,13 +12,13 @@ end: exit 1 else echo "Adding interface $bondif to bridge $newbridge." - sudo brctl addif $newbridge $bondif; + /usr/sbin/brctl addif $newbridge $bondif; if [ -n "$VAR(./cost/@)" ]; then - sudo brctl setpathcost $newbridge $bondif $VAR(./cost/@); + /usr/sbin/brctl setpathcost $newbridge $bondif $VAR(./cost/@); fi; if [ -n "$VAR(./priority/@)" ]; then - sudo brctl setportprio $newbridge $bondif $VAR(./priority/@); + /usr/sbin/brctl setportprio $newbridge $bondif $VAR(./priority/@); fi fi elif [ ${COMMIT_ACTION} = 'DELETE' ]; then @@ -32,7 +32,7 @@ end: # it gets deleted before the removal of bridge-groups under interfaces exit 0 else - sudo brctl delif $oldbridge $bondif + /usr/sbin/brctl delif $oldbridge $bondif fi else if [ -z "$newbridge" ]; then @@ -46,15 +46,15 @@ end: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ --bridge-notin-proposedcfg \ --bridge-interface="$oldbridge"; then \ - sudo brctl delif $oldbridge $bondif + /usr/sbin/brctl delif $oldbridge $bondif fi - sudo brctl addif $newbridge $bondif + /usr/sbin/brctl addif $newbridge $bondif fi if [ -n "$VAR(./cost/@)" ]; then - sudo brctl setpathcost $newbridge $bondif $VAR(./cost/@) + /usr/sbin/brctl setpathcost $newbridge $bondif $VAR(./cost/@) fi if [ -n "$VAR(./priority/@)" ]; then - sudo brctl setportprio $newbridge $bondif $VAR(./priority/@) + /usr/sbin/brctl setportprio $newbridge $bondif $VAR(./priority/@) fi fi fi diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/node.def index 04dc957b..42234106 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/node.def @@ -13,13 +13,13 @@ end: exit 1 else echo "Adding interface $bondif to bridge $newbridge." - sudo brctl addif $newbridge $bondif; + /usr/sbin/brctl addif $newbridge $bondif; if [ -n "$VAR(./cost/@)" ]; then - sudo brctl setpathcost $newbridge $bondif $VAR(./cost/@); + /usr/sbin/brctl setpathcost $newbridge $bondif $VAR(./cost/@); fi; if [ -n "$VAR(./priority/@)" ]; then - sudo brctl setportprio $newbridge $bondif $VAR(./priority/@); + /usr/sbin/brctl setportprio $newbridge $bondif $VAR(./priority/@); fi fi elif [ ${COMMIT_ACTION} = 'DELETE' ]; then @@ -33,7 +33,7 @@ end: # it gets deleted before the removal of bridge-groups under interfaces exit 0 else - sudo brctl delif $oldbridge $bondif + /usr/sbin/brctl delif $oldbridge $bondif fi else if [ -z "$newbridge" ]; then @@ -47,15 +47,15 @@ end: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ --bridge-notin-proposedcfg \ --bridge-interface="$oldbridge"; then \ - sudo brctl delif $oldbridge $bondif + /usr/sbin/brctl delif $oldbridge $bondif fi - sudo brctl addif $newbridge $bondif + /usr/sbin/brctl addif $newbridge $bondif fi if [ -n "$VAR(./cost/@)" ]; then - sudo brctl setpathcost $newbridge $bondif $VAR(./cost/@) + /usr/sbin/brctl setpathcost $newbridge $bondif $VAR(./cost/@) fi if [ -n "$VAR(./priority/@)" ]; then - sudo brctl setportprio $newbridge $bondif $VAR(./priority/@) + /usr/sbin/brctl setportprio $newbridge $bondif $VAR(./priority/@) fi fi fi diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index 343cf984..ec06c817 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -6,7 +6,7 @@ comp_help: "Enter bridge interface name (br0 - br999)" syntax:expression: pattern $VAR(@) "^br[0-9]+$" ; "Must be (br0 - br999)" -create: sudo brctl addbr $VAR(@) +create: /usr/sbin/brctl addbr $VAR(@) sudo ip link set $VAR(@) up delete: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ @@ -15,5 +15,5 @@ delete: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ exit 1 fi sudo ip link set $VAR(@) down; - sudo brctl delbr $VAR(@); + /usr/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 533a8ed5..9b7b58a1 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:expression: "/usr/sbin/brctl setageing $VAR(../@) $VAR(@)" +delete:expression: "/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/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..ec79a605 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:expression: "/usr/sbin/brctl sethello $VAR(../@) $VAR(@)" +delete:expression: "/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..9f9dc2f9 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:expression: "/usr/sbin/brctl setmaxage $VAR(../@) $VAR(@)" +delete:expression: "/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..a0211c1d 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:expression: "/usr/sbin/brctl setbridgeprio $VAR(../@) $VAR(@)" +delete:expression: "/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) diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/node.def index 7590dc96..c56c31cc 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/node.def @@ -11,13 +11,13 @@ end: exit 1 else echo "Adding interface $ethif to bridge $newbridge." - sudo brctl addif $newbridge $ethif; + /usr/sbin/brctl addif $newbridge $ethif; if [ -n "$VAR(./cost/@)" ]; then - sudo brctl setpathcost $newbridge $ethif $VAR(./cost/@); + /usr/sbin/brctl setpathcost $newbridge $ethif $VAR(./cost/@); fi; if [ -n "$VAR(./priority/@)" ]; then - sudo brctl setportprio $newbridge $ethif $VAR(./priority/@); + /usr/sbin/brctl setportprio $newbridge $ethif $VAR(./priority/@); fi fi elif [ ${COMMIT_ACTION} = 'DELETE' ]; then @@ -31,7 +31,7 @@ end: # it gets deleted before the removal of bridge-groups under interfaces exit 0 else - sudo brctl delif $oldbridge $ethif + /usr/sbin/brctl delif $oldbridge $ethif fi else if [ -z "$newbridge" ]; then @@ -45,15 +45,15 @@ end: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ --bridge-notin-proposedcfg \ --bridge-interface="$oldbridge"; then \ - sudo brctl delif $oldbridge $ethif + /usr/sbin/brctl delif $oldbridge $ethif fi - sudo brctl addif $newbridge $ethif + /usr/sbin/brctl addif $newbridge $ethif fi if [ -n "$VAR(./cost/@)" ]; then - sudo brctl setpathcost $newbridge $ethif $VAR(./cost/@) + /usr/sbin/brctl setpathcost $newbridge $ethif $VAR(./cost/@) fi if [ -n "$VAR(./priority/@)" ]; then - sudo brctl setportprio $newbridge $ethif $VAR(./priority/@) + /usr/sbin/brctl setportprio $newbridge $ethif $VAR(./priority/@) fi fi fi diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def index dd3863a0..84fa14f1 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def @@ -14,13 +14,13 @@ end: exit 1 else echo "Adding interface $ethif to bridge $newbridge." - sudo brctl addif $newbridge $ethif; + /usr/sbin/brctl addif $newbridge $ethif; if [ -n "$VAR(./cost/@)" ]; then - sudo brctl setpathcost $newbridge $ethif $VAR(./cost/@); + /usr/sbin/brctl setpathcost $newbridge $ethif $VAR(./cost/@); fi; if [ -n "$VAR(./priority/@)" ]; then - sudo brctl setportprio $newbridge $ethif $VAR(./priority/@); + /usr/sbin/brctl setportprio $newbridge $ethif $VAR(./priority/@); fi fi elif [ ${COMMIT_ACTION} = 'DELETE' ]; then @@ -34,7 +34,7 @@ end: # it gets deleted before the removal of bridge-groups under interfaces exit 0 else - sudo brctl delif $oldbridge $ethif + /usr/sbin/brctl delif $oldbridge $ethif fi else if [ -z "$newbridge" ]; then @@ -48,15 +48,15 @@ end: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ --bridge-notin-proposedcfg \ --bridge-interface="$oldbridge"; then \ - sudo brctl delif $oldbridge $ethif + /usr/sbin/brctl delif $oldbridge $ethif fi - sudo brctl addif $newbridge $ethif + /usr/sbin/brctl addif $newbridge $ethif fi if [ -n "$VAR(./cost/@)" ]; then - sudo brctl setpathcost $newbridge $ethif $VAR(./cost/@) + /usr/sbin/brctl setpathcost $newbridge $ethif $VAR(./cost/@) fi if [ -n "$VAR(./priority/@)" ]; then - sudo brctl setportprio $newbridge $ethif $VAR(./priority/@) + /usr/sbin/brctl setportprio $newbridge $ethif $VAR(./priority/@) fi fi fi |