From b9c3925b1f68534b51f4d2f2b239ae7cdd2ef030 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Tue, 5 Jun 2018 20:48:32 +0200 Subject: T684: make the 'run show configuration commands' and the |commands pipe use the new implementation. --- etc/bash_completion.d/vyatta-op | 2 +- templates/show/configuration/commands/node.def | 2 +- 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 -- cgit v1.2.3