diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-01-31 11:39:48 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2025-02-01 12:40:51 -0600 |
| commit | 332405d8e006eadc77ccd7bb99b3e9e6e6d8d0cc (patch) | |
| tree | 396ccedcb84b4739e26b1c87228a577ffd13a36a /python | |
| parent | 170541686cab7c2ba3fc0f376353d665c9a3040b (diff) | |
| download | vyos-1x-332405d8e006eadc77ccd7bb99b3e9e6e6d8d0cc.tar.gz vyos-1x-332405d8e006eadc77ccd7bb99b3e9e6e6d8d0cc.zip | |
vyconf: T6718: drop hybrid set/delete functions
The 'hybrid' mode of vyconfd validation and Cstore commit is no longer
needed, in preparation for full vyconfd support.
Revert "vyconf: T6718: use vy_set/delete in configsession and util"
This reverts commit 6999f85b2fc1c6e2421242e30e3810bd19250f3e.
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configsession.py | 4 | ||||
| -rw-r--r-- | python/vyos/utils/misc.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index dd3ad1e3d..90b96b88c 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -23,8 +23,8 @@ from vyos.utils.process import is_systemd_service_running from vyos.utils.dict import dict_to_paths CLI_SHELL_API = '/bin/cli-shell-api' -SET = '/usr/libexec/vyos/vyconf/vy_set' -DELETE = '/usr/libexec/vyos/vyconf/vy_delete' +SET = '/opt/vyatta/sbin/my_set' +DELETE = '/opt/vyatta/sbin/my_delete' COMMENT = '/opt/vyatta/sbin/my_comment' COMMIT = '/opt/vyatta/sbin/my_commit' DISCARD = '/opt/vyatta/sbin/my_discard' diff --git a/python/vyos/utils/misc.py b/python/vyos/utils/misc.py index ac8011b8d..d82655914 100644 --- a/python/vyos/utils/misc.py +++ b/python/vyos/utils/misc.py @@ -52,7 +52,7 @@ def install_into_config(conf, config_paths, override_prompt=True): continue try: - cmd(f'/usr/libexec/vyos/vyconf/vy_set {path}') + cmd(f'/opt/vyatta/sbin/my_set {path}') count += 1 except: failed.append(path) |