From f3b45e56dd88d41b294c663e82f9684d53f0acb9 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 1 Jun 2009 15:25:21 -0700
Subject: Fix more places where VAR is quoted

CLI quoting in expressions seems to have changed, so adapt.
Bug 4485
---
 templates/qos-policy/network-emulator/node.tag/bandwidth/node.def       | 2 +-
 templates/qos-policy/network-emulator/node.tag/burst/node.def           | 2 +-
 templates/qos-policy/network-emulator/node.tag/network-delay/node.def   | 2 +-
 .../qos-policy/network-emulator/node.tag/packet-corruption/node.def     | 2 +-
 templates/qos-policy/network-emulator/node.tag/packet-loss/node.def     | 2 +-
 .../qos-policy/network-emulator/node.tag/packet-reordering/node.def     | 2 +-
 templates/qos-policy/rate-limit/node.tag/bandwidth/node.def             | 2 +-
 templates/qos-policy/rate-limit/node.tag/burst/node.def                 | 2 +-
 templates/qos-policy/rate-limit/node.tag/latency/node.def               | 2 +-
 .../round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ip/protocol/node.def         | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def           | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def       | 2 +-
 .../traffic-limiter/node.tag/class/node.tag/bandwidth/node.def          | 2 +-
 .../qos-policy/traffic-limiter/node.tag/class/node.tag/burst/node.def   | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ip/dscp/node.def             | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ip/protocol/node.def         | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def           | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def       | 2 +-
 .../traffic-shaper/node.tag/class/node.tag/bandwidth/node.def           | 2 +-
 .../qos-policy/traffic-shaper/node.tag/class/node.tag/burst/node.def    | 2 +-
 .../qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def  | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ip/dscp/node.def             | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ip/protocol/node.def         | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def           | 2 +-
 .../node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def       | 2 +-
 .../qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def | 2 +-
 templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def | 2 +-
 templates/qos-policy/traffic-shaper/node.tag/default/burst/node.def     | 2 +-
 templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def   | 2 +-
 templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def  | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/templates/qos-policy/network-emulator/node.tag/bandwidth/node.def b/templates/qos-policy/network-emulator/node.tag/bandwidth/node.def
index 3e48fd3..db8ca65 100644
--- a/templates/qos-policy/network-emulator/node.tag/bandwidth/node.def
+++ b/templates/qos-policy/network-emulator/node.tag/bandwidth/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Set the bandwidth limit
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
 comp_help: Allowed values:
  <number>	   Bandwidth in Kbps per second
  <number><suffix>  Value with scaling suffix
diff --git a/templates/qos-policy/network-emulator/node.tag/burst/node.def b/templates/qos-policy/network-emulator/node.tag/burst/node.def
index 56174bb..4df45de 100644
--- a/templates/qos-policy/network-emulator/node.tag/burst/node.def
+++ b/templates/qos-policy/network-emulator/node.tag/burst/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set the burst size
 default: "15k"
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
 comp_help: Allowed values:
  <number>		Burst size in bytes
  <number><suffix>	Size with scaling suffix (kb, mb, gb)
diff --git a/templates/qos-policy/network-emulator/node.tag/network-delay/node.def b/templates/qos-policy/network-emulator/node.tag/network-delay/node.def
index ac08e1c..40b8437 100644
--- a/templates/qos-policy/network-emulator/node.tag/network-delay/node.def
+++ b/templates/qos-policy/network-emulator/node.tag/network-delay/node.def
@@ -1,5 +1,5 @@
 type: txt
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
 help: Setup network delay
 comp_help: Additional network delay in milliseconds
   <number>         Latency in milliseconds
diff --git a/templates/qos-policy/network-emulator/node.tag/packet-corruption/node.def b/templates/qos-policy/network-emulator/node.tag/packet-corruption/node.def
index 9533609..fb0e975 100644
--- a/templates/qos-policy/network-emulator/node.tag/packet-corruption/node.def
+++ b/templates/qos-policy/network-emulator/node.tag/packet-corruption/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Set emulated packet data corruption rate
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent $VAR(@)"
 comp_help: Allowed values:
  <number>%%        Percentage of packets affected
 
diff --git a/templates/qos-policy/network-emulator/node.tag/packet-loss/node.def b/templates/qos-policy/network-emulator/node.tag/packet-loss/node.def
index 16bc099..6501d7a 100644
--- a/templates/qos-policy/network-emulator/node.tag/packet-loss/node.def
+++ b/templates/qos-policy/network-emulator/node.tag/packet-loss/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Set emulated packet loss rate
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent $VAR(@)"
 comp_help: Allowed values:
  <number>%%        Percentage of packets affected
 
diff --git a/templates/qos-policy/network-emulator/node.tag/packet-reordering/node.def b/templates/qos-policy/network-emulator/node.tag/packet-reordering/node.def
index 278d4a5..ee5c64a 100644
--- a/templates/qos-policy/network-emulator/node.tag/packet-reordering/node.def
+++ b/templates/qos-policy/network-emulator/node.tag/packet-reordering/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Set emulated packet reordering percentage
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent $VAR(@)"
 commit:expression: $VAR(../network-delay) != "" ; \
        "Must specify network-delay for packet reordering"
 comp_help: Allowed values:
diff --git a/templates/qos-policy/rate-limit/node.tag/bandwidth/node.def b/templates/qos-policy/rate-limit/node.tag/bandwidth/node.def
index 3e48fd3..db8ca65 100644
--- a/templates/qos-policy/rate-limit/node.tag/bandwidth/node.def
+++ b/templates/qos-policy/rate-limit/node.tag/bandwidth/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Set the bandwidth limit
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
 comp_help: Allowed values:
  <number>	   Bandwidth in Kbps per second
  <number><suffix>  Value with scaling suffix
diff --git a/templates/qos-policy/rate-limit/node.tag/burst/node.def b/templates/qos-policy/rate-limit/node.tag/burst/node.def
index 56174bb..4df45de 100644
--- a/templates/qos-policy/rate-limit/node.tag/burst/node.def
+++ b/templates/qos-policy/rate-limit/node.tag/burst/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set the burst size
 default: "15k"
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
 comp_help: Allowed values:
  <number>		Burst size in bytes
  <number><suffix>	Size with scaling suffix (kb, mb, gb)
diff --git a/templates/qos-policy/rate-limit/node.tag/latency/node.def b/templates/qos-policy/rate-limit/node.tag/latency/node.def
index 486bfa3..bef5491 100644
--- a/templates/qos-policy/rate-limit/node.tag/latency/node.def
+++ b/templates/qos-policy/rate-limit/node.tag/latency/node.def
@@ -1,5 +1,5 @@
 type: txt
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
 default: "50ms"
 help: Set maximum latency
 comp_help: Limit on the queue size based on latency
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
index 4f3f18e..d02dc5c 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
index 1938d04..9c665c2 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol \"$VAR(@)\"" 
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
index 4f3f18e..d02dc5c 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
index 1938d04..9c665c2 100644
--- a/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ b/templates/qos-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol \"$VAR(@)\"" 
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
diff --git a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def
index a87dd30..21a46a4 100644
--- a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def
+++ b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Set the traffic-limit used for this class
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
 comp_help: Allowed values:
  <number>          Bandwidth in Kbps
  <number><suffix>  Value with scaling suffix
diff --git a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/burst/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/burst/node.def
index 54ae4f3..e22453c 100644
--- a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/burst/node.def
+++ b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/burst/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set the burst size for this class (default: 15kb)
 default: "15k"
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
 comp_help: Allowed values:
  <number>		Burst size in bytes
  <number><suffix>	Size with scaling suffix (kb, mb, gb)
diff --git a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
index 4f3f18e..d02dc5c 100644
--- a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
diff --git a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
index 1938d04..9c665c2 100644
--- a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol \"$VAR(@)\"" 
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
diff --git a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
index 4f3f18e..d02dc5c 100644
--- a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
diff --git a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
index 1938d04..9c665c2 100644
--- a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol \"$VAR(@)\"" 
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
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 6f15037..91d7762 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
@@ -1,7 +1,7 @@
 type: txt
 default: "100%"
 help: Set the bandwidth used for this class
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
 comp_help: Allowed values:
  <number>          Bandwidth in Kbps
  <number>%%        Percentage of overall rate (default 100%%)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/burst/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/burst/node.def
index 54ae4f3..e22453c 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/burst/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/burst/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set the burst size for this class (default: 15kb)
 default: "15k"
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
 comp_help: Allowed values:
  <number>		Burst size in bytes
  <number><suffix>	Size with scaling suffix (kb, mb, gb)
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 11bf6b9..09ba853 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
@@ -1,6 +1,6 @@
 type: txt
 help: Set the bandwidth limit for this class
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
 comp_help: Allowed values:
  <number>          Limit in Kbps
  <number>%%        Percentage of overall rate
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
index 4f3f18e..d02dc5c 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
index 1938d04..9c665c2 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol \"$VAR(@)\"" 
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
index 4f3f18e..d02dc5c 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
index 1938d04..9c665c2 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol \"$VAR(@)\"" 
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def
index 4e54850..2fbddac 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/set-dscp/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Change the Differentiated Services (DiffServ) field in the IP header
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
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 4d454d4..3743688 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
@@ -1,6 +1,6 @@
 type: txt
 help: Set the bandwidth used for default traffic
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \$VAR(@)"
 comp_help: Allowed values:
  <number>	   Bandwidth in Kbps per second
  <number>%%        Percentage of overall rate
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/burst/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/burst/node.def
index 81e468a..f21eb9b 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/burst/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/default/burst/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set the burst size for default traffic
 default: "15k"
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
 comp_help: Allowed values:
  <number>		Burst size in bytes
  <number><suffix>	Size with scaling suffix (kb, mb, gb)
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 19234d9..a0cc58b 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
@@ -1,6 +1,6 @@
 type: txt
 help: Set the bandwidth limit for default traffic
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
 comp_help: Allowed values:
  <number>          Limit in Kbps
  <number>%%        Percentage of overall rate
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def
index 5d20cf9..a469ae8 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/default/set-dscp/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Change the Differentiated Services (DiffServ) field in the IP header
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp \"$VAR(@)\""
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-- 
cgit v1.2.3