diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | scripts/vyatta-qos.pl | 4 | ||||
| -rw-r--r-- | templates/qos-policy/rate-control/node.def (renamed from templates/qos-policy/rate-limit/node.def) | 0 | ||||
| -rw-r--r-- | templates/qos-policy/rate-control/node.tag/bandwidth/node.def (renamed from templates/qos-policy/rate-limit/node.tag/bandwidth/node.def) | 0 | ||||
| -rw-r--r-- | templates/qos-policy/rate-control/node.tag/burst/node.def (renamed from templates/qos-policy/rate-limit/node.tag/burst/node.def) | 0 | ||||
| -rw-r--r-- | templates/qos-policy/rate-control/node.tag/description/node.def (renamed from templates/qos-policy/rate-limit/node.tag/description/node.def) | 0 | ||||
| -rw-r--r-- | templates/qos-policy/rate-control/node.tag/latency/node.def (renamed from templates/qos-policy/rate-limit/node.tag/latency/node.def) | 0 |
7 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 44c23f2..d70d917 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ cfgdir = $(datadir)/vyatta-cfg/templates gentmpdir = generated-templates share_perl5dir = /opt/vyatta/share/perl5/Vyatta/Qos +curverdir = $(sysconfdir)/config-migrate/current sbin_SCRIPTS = scripts/vyatta-qos.pl sbin_SCRIPTS += scripts/vyatta-qos-util.pl diff --git a/scripts/vyatta-qos.pl b/scripts/vyatta-qos.pl index 68af9e1..94cd179 100755 --- a/scripts/vyatta-qos.pl +++ b/scripts/vyatta-qos.pl @@ -28,10 +28,10 @@ my $debug = $ENV{'QOS_DEBUG'}; my %policies = ( 'traffic-shaper' => 'TrafficShaper', 'fair-queue' => 'FairQueue', - 'rate-limit' => 'RateLimiter', + 'rate-control' => 'RateLimiter', 'drop-tail' => 'DropTail', 'network-emulator' => 'NetworkEmulator', - 'round-robin' => 'RoundRobin', + 'round-robin' => 'RoundRobin', 'priority-queue' => 'Priority', 'random-detect' => 'RandomDetect', 'traffic-limiter' => 'TrafficLimiter', diff --git a/templates/qos-policy/rate-limit/node.def b/templates/qos-policy/rate-control/node.def index 57bf98e..57bf98e 100644 --- a/templates/qos-policy/rate-limit/node.def +++ b/templates/qos-policy/rate-control/node.def diff --git a/templates/qos-policy/rate-limit/node.tag/bandwidth/node.def b/templates/qos-policy/rate-control/node.tag/bandwidth/node.def index db8ca65..db8ca65 100644 --- a/templates/qos-policy/rate-limit/node.tag/bandwidth/node.def +++ b/templates/qos-policy/rate-control/node.tag/bandwidth/node.def diff --git a/templates/qos-policy/rate-limit/node.tag/burst/node.def b/templates/qos-policy/rate-control/node.tag/burst/node.def index 4df45de..4df45de 100644 --- a/templates/qos-policy/rate-limit/node.tag/burst/node.def +++ b/templates/qos-policy/rate-control/node.tag/burst/node.def diff --git a/templates/qos-policy/rate-limit/node.tag/description/node.def b/templates/qos-policy/rate-control/node.tag/description/node.def index 1e8e64f..1e8e64f 100644 --- a/templates/qos-policy/rate-limit/node.tag/description/node.def +++ b/templates/qos-policy/rate-control/node.tag/description/node.def diff --git a/templates/qos-policy/rate-limit/node.tag/latency/node.def b/templates/qos-policy/rate-control/node.tag/latency/node.def index bef5491..bef5491 100644 --- a/templates/qos-policy/rate-limit/node.tag/latency/node.def +++ b/templates/qos-policy/rate-control/node.tag/latency/node.def |