From 8c18c433b1fe85c3e5f246744474ab3d5cb59823 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 22 May 2019 11:51:26 -0500 Subject: T1397: Rewrite the config merge script Add support for the config merge script in vyos-1x. --- etc/bash_completion.d/vyatta-cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'etc') diff --git a/etc/bash_completion.d/vyatta-cfg b/etc/bash_completion.d/vyatta-cfg index 7e37e74..cf72330 100755 --- a/etc/bash_completion.d/vyatta-cfg +++ b/etc/bash_completion.d/vyatta-cfg @@ -201,13 +201,13 @@ vyatta_loadsave_complete() echo -e " https:///\t\t\tLoad from file on remote machine" echo -e " tftp:///\t\t\tLoad from file on remote machine" elif [ "$command" = "merge" ]; then - echo -e " \t\t\t\tMerge from system config file" - echo -e " \t\t\t\tMerge from file on local machine" - echo -e " scp://:@/\tMerge from file on remote machine" - echo -e " sftp://:@/\tMerge from file on remote machine" - echo -e " ftp://:@/\tMerge from file on remote machine" - echo -e " http:///\t\t\tMerge from file on remote machine" - echo -e " tftp:///\t\t\tMerge from file on remote machine" + echo -e " \t\t\t\t\tMerge from file on local machine" + echo -e " scp://[:]@/\t\tMerge from file on remote machine" + echo -e " sftp://[:]@/\tMerge from file on remote machine" + echo -e " http:///\t\t\t\tMerge from file on remote machine" + echo -e " https:///\t\t\t\tMerge from file on remote machine" + echo -e " ftp://[:]@/\t\tMerge from file on remote machine" + echo -e " tftp:///\t\t\t\tMerge from file on remote machine" elif [ "$command" = "save" ]; then echo -e " \t\t\t\tSave to system config file" echo -e " \t\t\t\tSave to file on local machine" -- cgit v1.2.3