From 332405d8e006eadc77ccd7bb99b3e9e6e6d8d0cc Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 31 Jan 2025 11:39:48 -0600 Subject: [PATCH] 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. --- python/vyos/configsession.py | 4 ++-- 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 dd3ad1e3d9..90b96b88c6 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -23,8 +23,8 @@ 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 ac8011b8d3..d82655914b 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)