summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-05-18 22:28:47 +0200
committerChristian Poessinger <christian@poessinger.com>2021-05-18 22:28:47 +0200
commit21d97ba0651fc20bded91e22e00a402d0044da3c (patch)
tree95ef4d9fc1c34bb31114d6e1d303df03004a46a0
parentb76931e6d3a4bd0cdb74ca447a746ab6855fcf55 (diff)
downloadvyos-1x-21d97ba0651fc20bded91e22e00a402d0044da3c.tar.gz
vyos-1x-21d97ba0651fc20bded91e22e00a402d0044da3c.zip
op-mode: drop full path to iproute2 binary
-rw-r--r--op-mode-definitions/ipv4-route.xml.in8
-rw-r--r--op-mode-definitions/show-interfaces-macsec.xml.in4
-rw-r--r--op-mode-definitions/show-vrf.xml.in2
-rw-r--r--op-mode-definitions/traceroute.xml.in20
4 files changed, 17 insertions, 17 deletions
diff --git a/op-mode-definitions/ipv4-route.xml.in b/op-mode-definitions/ipv4-route.xml.in
index 1bda3ac11..aab3df0f1 100644
--- a/op-mode-definitions/ipv4-route.xml.in
+++ b/op-mode-definitions/ipv4-route.xml.in
@@ -43,7 +43,7 @@
<list>&lt;x.x.x.x&gt;</list>
</completionHelp>
</properties>
- <command>sudo /sbin/ip neigh flush to "$5"</command>
+ <command>sudo ip neigh flush to "$5"</command>
</tagNode>
<tagNode name="interface">
<properties>
@@ -52,7 +52,7 @@
<script>${vyos_completion_dir}/list_interfaces.py</script>
</completionHelp>
</properties>
- <command>sudo /sbin/ip neigh flush dev "$5"</command>
+ <command>sudo ip neigh flush dev "$5"</command>
</tagNode>
</children>
</node>
@@ -66,7 +66,7 @@
<properties>
<help>Flush the kernel route cache</help>
</properties>
- <command>sudo /sbin/ip route flush cache</command>
+ <command>sudo ip route flush cache</command>
</leafNode>
<tagNode name="cache">
@@ -76,7 +76,7 @@
<list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt;</list>
</completionHelp>
</properties>
- <command>sudo /sbin/ip route flush cache "$5"</command>
+ <command>sudo ip route flush cache "$5"</command>
</tagNode>
</children>
</node>
diff --git a/op-mode-definitions/show-interfaces-macsec.xml.in b/op-mode-definitions/show-interfaces-macsec.xml.in
index 6aeab66af..a264ff22e 100644
--- a/op-mode-definitions/show-interfaces-macsec.xml.in
+++ b/op-mode-definitions/show-interfaces-macsec.xml.in
@@ -11,7 +11,7 @@
<path>interfaces macsec</path>
</completionHelp>
</properties>
- <command>/usr/sbin/ip macsec show</command>
+ <command>ip macsec show</command>
</node>
<tagNode name="macsec">
<properties>
@@ -20,7 +20,7 @@
<path>interfaces macsec</path>
</completionHelp>
</properties>
- <command>/usr/sbin/ip macsec show $4</command>
+ <command>ip macsec show $4</command>
</tagNode>
</children>
</node>
diff --git a/op-mode-definitions/show-vrf.xml.in b/op-mode-definitions/show-vrf.xml.in
index 438e7c334..9c38c30fe 100644
--- a/op-mode-definitions/show-vrf.xml.in
+++ b/op-mode-definitions/show-vrf.xml.in
@@ -21,7 +21,7 @@
<properties>
<help>Shows all process ids associated with VRF</help>
</properties>
- <command>/usr/sbin/ip vrf pids "$3"</command>
+ <command>ip vrf pids "$3"</command>
</leafNode>
</children>
</tagNode>
diff --git a/op-mode-definitions/traceroute.xml.in b/op-mode-definitions/traceroute.xml.in
index 1b619ed43..e3217235c 100644
--- a/op-mode-definitions/traceroute.xml.in
+++ b/op-mode-definitions/traceroute.xml.in
@@ -90,7 +90,7 @@
<list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/traceroute "$4"</command>
+ <command>sudo ip vrf exec "$3" /usr/bin/traceroute "$4"</command>
</tagNode>
<tagNode name="ipv4">
<properties>
@@ -99,13 +99,13 @@
<list>&lt;hostname&gt; &lt;x.x.x.x&gt;</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/traceroute -4 "$5"</command>
+ <command>sudo ip vrf exec "$3" /usr/bin/traceroute -4 "$5"</command>
<children>
<node name="tcp">
<properties>
<help>Route tracing and port detection using TCP</help>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/tcptraceroute "$5" </command>
+ <command>sudo ip vrf exec "$3" /usr/bin/tcptraceroute "$5" </command>
<children>
<tagNode name="port">
<properties>
@@ -114,7 +114,7 @@
<list>0-65535</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/tcptraceroute "$5" $8</command>
+ <command>sudo ip vrf exec "$3" /usr/bin/tcptraceroute "$5" $8</command>
</tagNode>
</children>
</node>
@@ -127,13 +127,13 @@
<list>&lt;hostname&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/traceroute -6 "$5"</command>
+ <command>sudo ip vrf exec "$3" /usr/bin/traceroute -6 "$5"</command>
<children>
<node name="tcp">
<properties>
<help>Use TCP/IPv6 packets to perform a traceroute</help>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/tcptraceroute6 "$5" </command>
+ <command>sudo ip vrf exec "$3" /usr/bin/tcptraceroute6 "$5" </command>
<children>
<tagNode name="port">
<properties>
@@ -142,7 +142,7 @@
<list>0-65535</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/tcptraceroute6 "$5" $8</command>
+ <command>sudo ip vrf exec "$3" /usr/bin/tcptraceroute6 "$5" $8</command>
</tagNode>
</children>
</node>
@@ -198,7 +198,7 @@
<list>&lt;fqdn&gt;</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$4" /usr/bin/mtr -4 "$6"</command>
+ <command>sudo ip vrf exec "$4" /usr/bin/mtr -4 "$6"</command>
</tagNode>
<tagNode name="ipv6">
<properties>
@@ -207,7 +207,7 @@
<list>&lt;fqdn&gt;</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$4" /usr/bin/mtr -6 "$6"</command>
+ <command>sudo ip vrf exec "$4" /usr/bin/mtr -6 "$6"</command>
</tagNode>
<tagNode name="">
<properties>
@@ -216,7 +216,7 @@
<list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
</completionHelp>
</properties>
- <command>sudo /usr/sbin/ip vrf exec "$4" /usr/bin/mtr "$5"</command>
+ <command>sudo ip vrf exec "$4" /usr/bin/mtr "$5"</command>
</tagNode>
</children>
</tagNode>