summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-08-03 19:10:10 +0200
committerChristian Poessinger <christian@poessinger.com>2020-08-03 19:10:19 +0200
commit6301c560df544ddac9838d0489941d84748cced3 (patch)
tree1d39f4a162bdce10dd93f8c74d430b0dc2fd980e
parentf2b84c3d6fe292944d0b0f3b0ab4a73629b0318a (diff)
downloadvyos-1x-6301c560df544ddac9838d0489941d84748cced3.tar.gz
vyos-1x-6301c560df544ddac9838d0489941d84748cced3.zip
ipv6-tool: op-mode: T2724: use full path to binary and quote arguments
-rw-r--r--op-mode-definitions/force-ipv6-nd.xml8
-rw-r--r--op-mode-definitions/force-ipv6-rd.xml10
2 files changed, 9 insertions, 9 deletions
diff --git a/op-mode-definitions/force-ipv6-nd.xml b/op-mode-definitions/force-ipv6-nd.xml
index 64c8347ea..49de097f6 100644
--- a/op-mode-definitions/force-ipv6-nd.xml
+++ b/op-mode-definitions/force-ipv6-nd.xml
@@ -4,12 +4,12 @@
<children>
<node name="ipv6-nd">
<properties>
- <help>ICMPv6 Neighbor Discovery tool</help>
+ <help>IPv6 Neighbor Discovery</help>
</properties>
<children>
<tagNode name="interface">
<properties>
- <help>IPv6 Neighbor Discovery on a specific interface</help>
+ <help>IPv6 Neighbor Discovery on specified interface</help>
<completionHelp>
<script>${vyos_completion_dir}/list_interfaces.py</script>
</completionHelp>
@@ -17,12 +17,12 @@
<children>
<tagNode name="address">
<properties>
- <help>The IP address of the target</help>
+ <help>IPv6 address of node to lookup</help>
<completionHelp>
<list>&lt;h:h:h:h:h:h:h:h&gt;</list>
</completionHelp>
</properties>
- <command>ndisc6 $6 $4 -m</command>
+ <command>/usr/bin/ndisc6 -m "$6" "$4"</command>
</tagNode>
</children>
</tagNode>
diff --git a/op-mode-definitions/force-ipv6-rd.xml b/op-mode-definitions/force-ipv6-rd.xml
index 722cb67bf..8c901af25 100644
--- a/op-mode-definitions/force-ipv6-rd.xml
+++ b/op-mode-definitions/force-ipv6-rd.xml
@@ -4,26 +4,26 @@
<children>
<node name="ipv6-rd">
<properties>
- <help>IPv6 Router Discovery tool</help>
+ <help>IPv6 Router Discovery</help>
</properties>
<children>
<tagNode name="interface">
<properties>
- <help>IPv6 Router Discovery tool on a specific interface</help>
+ <help>IPv6 Router Discovery on specified interface</help>
<completionHelp>
<script>${vyos_completion_dir}/list_interfaces.py</script>
</completionHelp>
</properties>
- <command>rdisc6 $4</command>
+ <command>/usr/bin/rdisc6 "$4"</command>
<children>
<tagNode name="address">
<properties>
- <help>The IP address of the target</help>
+ <help>IPv6 address of target</help>
<completionHelp>
<list>&lt;h:h:h:h:h:h:h:h&gt;</list>
</completionHelp>
</properties>
- <command>rdisc6 $6 $4 -m</command>
+ <command>/usr/bin/rdisc6 -m "$6" "$4"</command>
</tagNode>
</children>
</tagNode>