summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2025-02-04 16:00:53 +0000
committerGitHub <noreply@github.com>2025-02-04 16:00:53 +0000
commitc1cd7b4a7665f29ffcbe22d8450abaa759932242 (patch)
treed6596d4a39f2e2d6b46358a05602553be2cc5196
parent41a5ca00fef7cc1b9e3d541f37e33876c6f385a0 (diff)
parent332405d8e006eadc77ccd7bb99b3e9e6e6d8d0cc (diff)
downloadvyos-1x-c1cd7b4a7665f29ffcbe22d8450abaa759932242.tar.gz
vyos-1x-c1cd7b4a7665f29ffcbe22d8450abaa759932242.zip
Merge pull request #4329 from jestabro/drop-hybrid
vyconf: T6718: drop hybrid set/delete functions
-rw-r--r--python/vyos/configsession.py4
-rw-r--r--python/vyos/utils/misc.py2
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)