diff options
| -rw-r--r-- | etc/bash_completion.d/vyatta-cfg | 9 | ||||
| -rw-r--r-- | functions/interpreter/vyatta-cfg-run | 13 | ||||
| -rwxr-xr-x | scripts/init/vyos-router | 4 | ||||
| -rw-r--r-- | src/commit/commit-algorithm.cpp | 4 | ||||
| -rw-r--r-- | src/cstore/cstore.cpp | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/etc/bash_completion.d/vyatta-cfg b/etc/bash_completion.d/vyatta-cfg index b24055a..6dfe663 100644 --- a/etc/bash_completion.d/vyatta-cfg +++ b/etc/bash_completion.d/vyatta-cfg @@ -232,14 +232,7 @@ vyatta_loadsave_complete() print_commit_log () { - local -a array - eval "array=($(${vyatta_sbindir}/vyatta-config-mgmt.pl --action=show-commit-log-brief))" - local count=0 - for i in "${array[@]}"; do - i=${i//_/ } - echo -e " $count\t$i" - (( count++ )) - done + ${vyos_op_scripts_dir}/config_mgmt.py show_commit_log_brief } vyatta_rollback_complete () diff --git a/functions/interpreter/vyatta-cfg-run b/functions/interpreter/vyatta-cfg-run index b4c2ea6..2f8f50d 100644 --- a/functions/interpreter/vyatta-cfg-run +++ b/functions/interpreter/vyatta-cfg-run @@ -150,17 +150,18 @@ vyatta_config_commit-confirm () args[${#args[@]}]="$arg" fi done - cmd="${vyatta_sbindir}/vyatta-config-mgmt.pl --action=commit-confirm \ - --minutes=$minutes" + cmd="${vyos_bin_dir}/config-mgmt commit_confirm -t=$minutes" eval "sudo sg vyattacfg \"$cmd\" " if [ $? = 0 ]; then + export IN_COMMIT_CONFIRM=t vyatta_config_commit "$@" + unset IN_COMMIT_CONFIRM fi } vyatta_config_confirm () { - ${vyatta_sbindir}/vyatta-config-mgmt.pl --action=confirm + ${vyos_bin_dir}/config-mgmt confirm } vyatta_config_compare () @@ -169,9 +170,9 @@ vyatta_config_compare () local -a filtered=() get_prefix_filtered_list $1 comp filtered if [[ "${filtered[0]}" == "saved" ]]; then - cli-shell-api showConfig --show-cfg1 /config/config.boot --show-cfg2 @WORKING --show-context-diff + ${vyos_bin_dir}/config-mgmt compare --saved else - ${vyatta_sbindir}/vyatta-config-mgmt.pl --action=diff "$@" | eval "${VYATTA_PAGER:-cat}" + ${vyos_bin_dir}/config-mgmt wrap_compare --options "$@" | eval "${VYATTA_PAGER:-cat}" fi } @@ -208,7 +209,7 @@ vyatta_config_rollback () echo "Error: must include a revision # to rollback to" return 1; fi - sudo ${vyatta_sbindir}/vyatta-config-mgmt.pl --action=rollback --revnum "$@" + sudo ${vyos_bin_dir}/config-mgmt rollback --rev "$@" } shutdown () diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index 8fdcc12..c614a4e 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -230,7 +230,9 @@ security_reset () rm -f /etc/iproute2/rt_tables.d/vyos-*.conf # Container - rm -f /etc/containers/storage.conf /etc/containers/registries.conf + rm -f /etc/containers/storage.conf /etc/containers/registries.conf /etc/containers/containers.conf + # Clean all networks and re-create them from our CLI + rm -f /etc/containers/networks/* # System Options (SSH/cURL) rm -f /etc/ssh/ssh_config.d/*vyos*.conf diff --git a/src/commit/commit-algorithm.cpp b/src/commit/commit-algorithm.cpp index 13d3500..f04b8c2 100644 --- a/src/commit/commit-algorithm.cpp +++ b/src/commit/commit-algorithm.cpp @@ -14,6 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <unistd.h> + #include <cstdio> #include <vector> #include <string> @@ -1358,6 +1360,8 @@ commit::doCommit(Cstore& cs, CfgNode& cfg1, CfgNode& cfg2) ret = cs.markSessionUnsaved(); } + sync(); + setenv("COMMIT_STATUS", cst, 1); _execute_hooks(POST_COMMIT); unsetenv("COMMIT_STATUS"); diff --git a/src/cstore/cstore.cpp b/src/cstore/cstore.cpp index b9f68a2..4f19ebf 100644 --- a/src/cstore/cstore.cpp +++ b/src/cstore/cstore.cpp @@ -2901,7 +2901,7 @@ Cstore::validate_val(const tr1::shared_ptr<Ctemplate>& def, const char *value) #if __GNUC__ < 6 auto_ptr<char> vbuf(strdup(value)); #else - unique_ptr<char> vbuf(strdup(value)); + unique_ptr<char, decltype(&std::free)> vbuf { strdup(value), &std::free }; #endif /* set the handle to be used during validate_value() for var ref |