diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-04-17 23:52:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 23:52:58 +0100 |
| commit | 81048da3bc1438b89e2b9bdb3006cf886d1f548f (patch) | |
| tree | d6b9eeaf8845cb37ec97395f04a92781224a31b8 | |
| parent | 754d45c69f1f34a7aa90377b469661f4fa1f0695 (diff) | |
| parent | 3d57999aae0117055921f085ad07d79ba10c4e10 (diff) | |
| download | vyatta-cfg-81048da3bc1438b89e2b9bdb3006cf886d1f548f.tar.gz vyatta-cfg-81048da3bc1438b89e2b9bdb3006cf886d1f548f.zip | |
Merge pull request #56 from erkin/current
loadkey: T3506: Remove (what remains of) loadkey
| -rw-r--r-- | etc/bash_completion.d/vyatta-cfg | 13 | ||||
| -rw-r--r-- | functions/interpreter/vyatta-cfg-run | 5 |
2 files changed, 0 insertions, 18 deletions
diff --git a/etc/bash_completion.d/vyatta-cfg b/etc/bash_completion.d/vyatta-cfg index c679374..6dfe663 100644 --- a/etc/bash_completion.d/vyatta-cfg +++ b/etc/bash_completion.d/vyatta-cfg @@ -230,19 +230,6 @@ vyatta_loadsave_complete() eval $restore_shopts } -vyatta_config_loadkey() -{ - echo "Warning: The obsolete 'loadkey' command has been phased out." - echo "Instead, use the op-mode command 'generate public-key-command' to generate commands for manual addition:" - echo '$ generate public-key-command name <username> path <path-or-url>' - echo -} - -vyatta_loadkey_complete() -{ - true -} - print_commit_log () { ${vyos_op_scripts_dir}/config_mgmt.py show_commit_log_brief diff --git a/functions/interpreter/vyatta-cfg-run b/functions/interpreter/vyatta-cfg-run index 4280159..2f8f50d 100644 --- a/functions/interpreter/vyatta-cfg-run +++ b/functions/interpreter/vyatta-cfg-run @@ -34,7 +34,6 @@ _vyatta_cfg_cmds=( "confirm" \ "edit" \ "exit" \ "load" \ - "loadkey" \ "merge" \ "rename" \ "rollback" \ @@ -54,7 +53,6 @@ _vyatta_cfg_helps=( \ "Edit a sub-element" \ "Exit from this configuration level" \ "Load configuration from a file and replace running configuration" \ - "Load user SSH key from a file" \ "Load configuration from a file and merge running configuration" \ "Rename a configuration element" \ "Rollback to a prior config revision (requires reboot)" \ @@ -571,7 +569,6 @@ vyatta_cfg_run () compare) vyatta_config_compare "${@:2}";; save) vyatta_config_save "${@:2}" ;; merge) vyatta_config_merge "${@:2}" ;; - loadkey) vyatta_config_loadkey "${@:2}";; *) vyatta_cfg_cmd $fcmd "${@:2}" ;; # commands requiring path expansion must go through here esac } @@ -613,8 +610,6 @@ _vyatta_cfg_init () complete -F vyatta_single_word_complete ${cmd:0:$pos} ;; run) complete -F vyatta_run_complete ${cmd:0:$pos} ;; - loadkey) - complete -F vyatta_loadkey_complete ${cmd:0:$pos} ;; compare) complete -F vyatta_compare_complete ${cmd:0:$pos} ;; rollback) |