diff options
| author | hagbard <vyosdev@derith.de> | 2019-10-08 09:44:10 -0700 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-10-08 09:44:10 -0700 |
| commit | a2c7b5f78cd0439599686147494e4f683618e14a (patch) | |
| tree | 52257c4ddfb650786fa6114591cfecde71c89add /functions | |
| parent | e8bb5818b84dd9728b77e78dcef08869ca1146d5 (diff) | |
| parent | 8fa0ba1fd39145368f04576323ab3a29f42a508d (diff) | |
| download | vyatta-cfg-a2c7b5f78cd0439599686147494e4f683618e14a.tar.gz vyatta-cfg-a2c7b5f78cd0439599686147494e4f683618e14a.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/interpreter/vyatta-cfg-run | 2 | ||||
| -rw-r--r-- | functions/wrapper/script-template | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/functions/interpreter/vyatta-cfg-run b/functions/interpreter/vyatta-cfg-run index a274e24..3ec3d6f 100644 --- a/functions/interpreter/vyatta-cfg-run +++ b/functions/interpreter/vyatta-cfg-run @@ -229,7 +229,7 @@ vyatta_config_load () fi # return to top level. reset_edit_level - ${vyatta_sbindir}/vyatta-load-config.pl "$@" + ${vyos_libexec_dir}/vyos-load-config.py "$@" } vyatta_config_merge () diff --git a/functions/wrapper/script-template b/functions/wrapper/script-template index 51cb2c0..f88f410 100644 --- a/functions/wrapper/script-template +++ b/functions/wrapper/script-template @@ -108,7 +108,7 @@ function load () fi # return to top level. reset_edit_level - ${vyatta_sbindir}/vyatta-load-config.pl "$@" + ${vyos_libexec_dir}/vyos-load-config.py "$@" } function save () |