summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-06-05 20:48:32 +0200
committerDaniil Baturin <daniil@baturin.org>2018-06-05 20:48:32 +0200
commitb9c3925b1f68534b51f4d2f2b239ae7cdd2ef030 (patch)
tree414ed877c0eb993aea00edbe8b7c6d0294ea25de
parent1c911e9b090638abebb0f91b20e2f42e7ebe2a28 (diff)
downloadvyatta-op-b9c3925b1f68534b51f4d2f2b239ae7cdd2ef030.tar.gz
vyatta-op-b9c3925b1f68534b51f4d2f2b239ae7cdd2ef030.zip
T684: make the 'run show configuration commands' and the |commands pipe use the new implementation.
-rw-r--r--etc/bash_completion.d/vyatta-op2
-rw-r--r--templates/show/configuration/commands/node.def2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/bash_completion.d/vyatta-op b/etc/bash_completion.d/vyatta-op
index 47092a2..d917806 100644
--- a/etc/bash_completion.d/vyatta-op
+++ b/etc/bash_completion.d/vyatta-op
@@ -500,7 +500,7 @@ strip-private ()
commands ()
{
if [ "$_OFR_CONFIGURE" != "" ]; then
- ${vyatta_sbindir}/vyatta-config-gen-sets.pl -
+ ${vyos_libexec_dir}/commands-pipe.py
else
echo "commands pipe is not supported in operational mode"
fi
diff --git a/templates/show/configuration/commands/node.def b/templates/show/configuration/commands/node.def
index a2d55cf..f2e047e 100644
--- a/templates/show/configuration/commands/node.def
+++ b/templates/show/configuration/commands/node.def
@@ -1,7 +1,7 @@
help: Show running configuration as set commands
run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
then
- ${vyatta_sbindir}/vyatta-config-gen-sets.pl
+ cli-shell-api showCfg --show-active-only | vyos-config-to-commands
else
echo Must be an admin user to run this command.
fi