summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Topp <andrewt@telekinetica.net>2024-06-04 20:22:57 +1000
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-06-05 07:45:29 +0000
commite4d1d4a319ee2bda043c096e36a59ff1ff060a53 (patch)
tree1906f93447350617044099ea558f11e2fdf3aa27
parent9017dad232c00ed10347ff9b1adec3324b3bff71 (diff)
downloadvyos-1x-e4d1d4a319ee2bda043c096e36a59ff1ff060a53.tar.gz
vyos-1x-e4d1d4a319ee2bda043c096e36a59ff1ff060a53.zip
T6431: op-mode command monitor traceroute missing recursive symlink
Likely this was copied from mtr in the past but the symlink wasn't added to the Makefile. I've also swapped the completion help text around to match the commands. (cherry picked from commit de1479b06cb9b292fe4919c5949f3d3599ea11c7)
-rw-r--r--Makefile1
-rw-r--r--op-mode-definitions/mtr.xml.in4
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 44a6e35ed..3b26273d6 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ op_mode_definitions: $(op_xml_obj)
ln -s ../node.tag $(OP_TMPL_DIR)/ping/node.tag/node.tag/
ln -s ../node.tag $(OP_TMPL_DIR)/traceroute/node.tag/node.tag/
ln -s ../node.tag $(OP_TMPL_DIR)/mtr/node.tag/node.tag/
+ ln -s ../node.tag $(OP_TMPL_DIR)/monitor/traceroute/node.tag/node.tag/
# XXX: test if there are empty node.def files - this is not allowed as these
# could mask help strings or mandatory priority statements
diff --git a/op-mode-definitions/mtr.xml.in b/op-mode-definitions/mtr.xml.in
index 8239aec4c..66729e2bc 100644
--- a/op-mode-definitions/mtr.xml.in
+++ b/op-mode-definitions/mtr.xml.in
@@ -13,7 +13,7 @@
<children>
<leafNode name="node.tag">
<properties>
- <help>mtr options</help>
+ <help>Traceroute options</help>
<completionHelp>
<script>${vyos_op_scripts_dir}/mtr.py --get-options-nested "${COMP_WORDS[@]}"</script>
</completionHelp>
@@ -35,7 +35,7 @@
<children>
<leafNode name="node.tag">
<properties>
- <help>Traceroute options</help>
+ <help>mtr options</help>
<completionHelp>
<script>${vyos_op_scripts_dir}/mtr.py --get-options "${COMP_WORDS[@]}"</script>
</completionHelp>