diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-11-21 08:47:13 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-11-21 08:47:13 -0800 |
| commit | 1962b4d7d72833479789d29622ef5ce2c2f4662f (patch) | |
| tree | 05f4718142fb328ea9972a50b5371c5a7a5d6b71 /templates/interfaces | |
| parent | 790663c88fb291ddb5b645bdde62d8229d5e115b (diff) | |
| parent | 375ee54821c5d1f4b29ea11c1b522b0cdabf2e3f (diff) | |
| download | vyatta-cfg-qos-1962b4d7d72833479789d29622ef5ce2c2f4662f.tar.gz vyatta-cfg-qos-1962b4d7d72833479789d29622ef5ce2c2f4662f.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-qos into jenner
Conflicts:
lib/Vyatta/Qos/TrafficLimiter.pm
Diffstat (limited to 'templates/interfaces')
7 files changed, 19 insertions, 15 deletions
diff --git a/templates/interfaces/bonding/node.tag/qos-policy/out/node.def b/templates/interfaces/bonding/node.tag/qos-policy/out/node.def index ec96f0f..c7d6ad2 100644 --- a/templates/interfaces/bonding/node.tag/qos-policy/out/node.def +++ b/templates/interfaces/bonding/node.tag/qos-policy/out/node.def @@ -1,6 +1,6 @@ type: txt help: Set output QOS policy for specified bonding interface allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out -create: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100 -update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $VAR(../../@) $VAR(.) $VAR(@) +update: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100 + /opt/vyatta/sbin/vyatta-qos.pl --update-interface $VAR(../../@) $VAR(.) $VAR(@) delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $VAR(../../@) $VAR(.) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def index df0ea43..729fa7c 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def @@ -1,8 +1,8 @@ type: txt help: Set outbound QOS policy allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out -create: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100 -update: /opt/vyatta/sbin/vyatta-qos.pl \ +update: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100 + /opt/vyatta/sbin/vyatta-qos.pl \ --update-interface $VAR(../../../@).$VAR(../../@) $VAR(.) $VAR(@) delete: /opt/vyatta/sbin/vyatta-qos.pl \ --delete-interface $VAR(../../../@).$VAR(../../@) $VAR(.) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def index df0ea43..548cc8c 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def @@ -1,9 +1,9 @@ type: txt help: Set outbound QOS policy allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out -create: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100 -update: /opt/vyatta/sbin/vyatta-qos.pl \ - --update-interface $VAR(../../../@).$VAR(../../@) $VAR(.) $VAR(@) +update: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100 + /opt/vyatta/sbin/vyatta-qos.pl \ + --update-interface $VAR(../../../@).$VAR(../../@) $VAR(.) $VAR(@) delete: /opt/vyatta/sbin/vyatta-qos.pl \ --delete-interface $VAR(../../../@).$VAR(../../@) $VAR(.) sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 0 diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def index f4b7221..2f92a3b 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def @@ -1,9 +1,10 @@ type: txt help: Set outbound QOS policy allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out -create: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100 -update: /opt/vyatta/sbin/vyatta-qos.pl \ +update: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100 + /opt/vyatta/sbin/vyatta-qos.pl \ --update-interface $VAR(../../../../@).$VAR(../../@) $VAR(.) $VAR(@) delete: /opt/vyatta/sbin/vyatta-qos.pl \ --delete-interface $VAR(../../../../@).$VAR(../../@) $VAR(.) + sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 0 diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def index 905c3b5..67482aa 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def @@ -1,8 +1,9 @@ type: txt help: Set outbound QOS policy allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out -create: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100 -update: /opt/vyatta/sbin/vyatta-qos.pl \ +update: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100 + /opt/vyatta/sbin/vyatta-qos.pl \ --update-interface $VAR(../../../../@).$VAR(../../@) $VAR(.) $VAR(@) delete: /opt/vyatta/sbin/vyatta-qos.pl \ --delete-interface $VAR(../../../../@).$VAR(../../@) $VAR(.) + sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 0 diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def index 905c3b5..67482aa 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def @@ -1,8 +1,9 @@ type: txt help: Set outbound QOS policy allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out -create: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100 -update: /opt/vyatta/sbin/vyatta-qos.pl \ +update: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100 + /opt/vyatta/sbin/vyatta-qos.pl \ --update-interface $VAR(../../../../@).$VAR(../../@) $VAR(.) $VAR(@) delete: /opt/vyatta/sbin/vyatta-qos.pl \ --delete-interface $VAR(../../../../@).$VAR(../../@) $VAR(.) + sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 0 diff --git a/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def b/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def index 063fe58..13c78af 100644 --- a/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def +++ b/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def @@ -1,6 +1,7 @@ type: txt help: Set the tunnel QoS policy allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out -create: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100 -update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $VAR(../../@) $VAR(.) $VAR(@) +update: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100 + /opt/vyatta/sbin/vyatta-qos.pl --update-interface $VAR(../../@) $VAR(.) $VAR(@) delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $VAR(../../@) $VAR(.) + sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 0 |