Merge pull request #4329 from jestabro/drop-hybrid

vyconf: T6718: drop hybrid set/delete functions
vyos · Feb 4, 2025 · c1cd7b4 · c1cd7b4
2 parents 41a5ca0 + 332405d
commit c1cd7b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)