Skip to content

T7374: allow use of exisiting vyconf replacements for my_* commands #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmbaturin merged 1 commit into from
Jun 5, 2025
Merged

T7374: allow use of exisiting vyconf replacements for my_* commands #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions functions/interpreter/vyatta-cfg-run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,17 @@ vyatta_config_show ()

vyatta_config_commit ()
{
if ! vyatta_cli_shell_api sessionChanged; then
echo "No configuration changes to commit"
return 1;
if test -f "/var/run/vyconf_backend"; then
echo $$
if ! /usr/libexec/vyos/vyconf/bin/vy_session_changed; then
echo "No configuration changes to commit"
return 1;
fi
else
if ! vyatta_cli_shell_api sessionChanged; then
echo "No configuration changes to commit"
return 1;
fi
fi
local comment="commit"
local next=0
Expand All @@ -126,16 +134,28 @@ vyatta_config_commit ()

export COMMIT_COMMENT="$comment"
export COMMIT_VIA=cli
/opt/vyatta/sbin/my_commit "${args[@]}" 2>&1
if test -f "/var/run/vyconf_backend"; then
/usr/libexec/vyos/vyconf/bin/vy_commit "${args[@]}" 2>&1
else
/opt/vyatta/sbin/my_commit "${args[@]}" 2>&1
fi
unset COMMIT_VIA
unset COMMIT_COMMENT
}

vyatta_config_commit-confirm ()
{
if ! vyatta_cli_shell_api sessionChanged; then
echo "No configuration changes to commit"
return 1;
if test -f "/var/run/vyconf_backend"; then
echo $$
if ! /usr/libexec/vyos/vyconf/bin/vy_session_changed; then
echo "No configuration changes to commit"
return 1;
fi
else
if ! vyatta_cli_shell_api sessionChanged; then
echo "No configuration changes to commit"
return 1;
fi
fi
local -a args=()
local first=1
Expand Down Expand Up @@ -358,7 +378,11 @@ vyatta_cfg_cmd_run ()
elif [[ "$cmd" == "show" ]]; then
vyatta_config_show "${@:2}"
else
cmd="/opt/vyatta/sbin/my_$cmd"
if test -f "/var/run/vyconf_backend"; then
cmd="${vyconf_bin_dir}/vy_$cmd"
else
cmd="/opt/vyatta/sbin/my_$cmd"
fi
output=$($cmd "${@:2}")
fi
vyatta_cfg_print_output "$output"
Expand Down
Loading