From 8ed8df0993705bd51aa3167dd364bd40cfc6fc68 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 6 Feb 2008 14:10:33 -0800
Subject: fix problems with percent sign in comp_help

comp_help is displayed via printf so % must be doubled.
Fixes: https://bugzilla.vyatta.com/show_bug.cgi?id=2762
---
 .../traffic-shaper/node.tag/class/node.tag/bandwidth/node.def           | 2 +-
 .../qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def  | 2 +-
 templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def | 2 +-
 templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'templates')

diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def
index 839cb0f..0842f6d 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def
@@ -5,7 +5,7 @@ syntax:expression: exec "[[ \"$VAR(@)\" =~  '^[0-9]+(\.[0-9]*)?%$' ]] || \
 	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
 comp_help: Allowed values:
  <number>          Bandwidth in Kbps
- <number>%         Percentage of overall rate (default 100%)
+ <number>%%         Percentage of overall rate (default 100%%)
  <number><suffix>  Value with scaling suffix
                    bits per sec (kbit, mbit, gbit)
                    bytes per sec (kbps, mbps, gbps)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def
index 65909d0..4373eac 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def
@@ -4,6 +4,6 @@ syntax:expression: exec "[[ \"$VAR(@)\" =~  '^[0-9]+(\.[0-9]*)?%$' ]] || \
 	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
 comp_help: Allowed values:
  <number>          Limit in Kbps
- <number>%         Percentage of overall rate (default 100%)
+ <number>%%         Percentage of overall rate
  <number><suffix>  Value with scaling suffix
                    bits per sec (kbit, mbit, gbit)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def
index d728aa1..f3e3b53 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def
@@ -4,7 +4,7 @@ syntax:expression: exec "[[ \"$VAR(@)\" =~ '^[0-9]+(\.[0-9]*)?%$' ]] || \
 	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
 comp_help: Allowed values:
  <number>	   Bandwidth in Kbps per second
- <number>%         Percentage of overall rate
+ <number>%%         Percentage of overall rate
  <number><suffix>  Value with scaling suffix
                    bits per sec (kbit, mbit, gbit)
                    bytes per sec (kbps, mbps, gbps)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def
index 4b8bb3f..3176111 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def
@@ -5,6 +5,6 @@ syntax:expression: exec "[[ \"$VAR(@)\" =~  '^[0-9]+(\.[0-9]*)?%$' ]] || \
 	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
 comp_help: Allowed values:
  <number>          Limit in Kbps
- <number>%         Percentage of overall rate (default 100%)
+ <number>%%         Percentage of overall rate (default 100%%)
  <number><suffix>  Value with scaling suffix
                    bits per sec (kbit, mbit, gbit)
-- 
cgit v1.2.3