diff options
author | John Estabrook <jestabro@sentrium.io> | 2019-05-30 14:02:44 -0500 |
---|---|---|
committer | John Estabrook <jestabro@sentrium.io> | 2019-05-30 14:02:44 -0500 |
commit | e4fe8143d9a9d86eafe04fed3cd788659b46f465 (patch) | |
tree | 7d912fa34cc49f5bbdaac3c9a6f1cf7435c678c6 /scripts/vyatta-save-config.pl | |
parent | ec0d803a673a85e1159305fcab335679b9fad720 (diff) | |
download | vyatta-cfg-e4fe8143d9a9d86eafe04fed3cd788659b46f465.tar.gz vyatta-cfg-e4fe8143d9a9d86eafe04fed3cd788659b46f465.zip |
T1334: Migration script runner rewrite
Use vyos-1x migration script runner.
Diffstat (limited to 'scripts/vyatta-save-config.pl')
-rwxr-xr-x | scripts/vyatta-save-config.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/vyatta-save-config.pl b/scripts/vyatta-save-config.pl index 0799dd4..19941a7 100755 --- a/scripts/vyatta-save-config.pl +++ b/scripts/vyatta-save-config.pl @@ -77,7 +77,7 @@ if ($mode eq 'local' and !($save_file =~ /^\//)) { $save_file = "$bootpath/$save_file"; } -my $version_str = `/opt/vyatta/sbin/vyatta_current_conf_ver.pl`; +my $version_str = `/usr/libexec/vyos/system-versions-foot.py`; # when presenting to users, show shortened /config path my $shortened_save_file = get_short_config_path($save_file); @@ -88,7 +88,7 @@ if ($mode eq 'local') { # first check if this file exists, and if so ensure this is a config file. if (-e $save_file) { - my $result = `grep ' === vyatta-config-version:' $save_file`; + my $result = `grep -e ' === vyatta-config-version:' -e '// vyos-config-version:' $save_file`; if (!defined $result || length($result) == 0) { print "File exists and is not a Vyatta configuration file, aborting save!\n"; exit 1; |