summaryrefslogtreecommitdiff
path: root/scripts/vyatta-load-config.pl
diff options
context:
space:
mode:
authorMohit Mehta <mohit@vyatta.com>2011-05-04 17:41:21 -0700
committerMohit Mehta <mohit@vyatta.com>2011-05-04 17:41:21 -0700
commit828ddec316c54b5550a0c5cdc0c964e454e67f86 (patch)
treec57985cd99a3f57bbaa0ceb926cd51ff13f14944 /scripts/vyatta-load-config.pl
parent20935c34d6fad4af9ab27e4a1b934e7e9e375358 (diff)
downloadvyatta-cfg-828ddec316c54b5550a0c5cdc0c964e454e67f86.tar.gz
vyatta-cfg-828ddec316c54b5550a0c5cdc0c964e454e67f86.zip
Fix Bug 7010 Update commands to save/retrieve files from /config
* use shorter /config path when presenting configuration directory to users
Diffstat (limited to 'scripts/vyatta-load-config.pl')
-rwxr-xr-xscripts/vyatta-load-config.pl7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/vyatta-load-config.pl b/scripts/vyatta-load-config.pl
index 116e506..7bf7779 100755
--- a/scripts/vyatta-load-config.pl
+++ b/scripts/vyatta-load-config.pl
@@ -29,6 +29,7 @@ use Getopt::Long;
use Sys::Syslog qw(:standard :macros);
use Vyatta::Config;
use Vyatta::ConfigLoad;
+use Vyatta::Misc qw(get_short_config_path);
$SIG{'INT'} = 'IGNORE';
@@ -174,7 +175,11 @@ system("$sbindir/vyatta_config_migrate.pl $load_file");
# note: "load" is now handled in the backend so only "merge" is actually
# handled in this script. "merge" hasn't been moved into the backend since
# the command itself needs to be revisited after mendocino time frame.
-print "Loading configuration from '$load_file'...\n";
+
+# when presenting to users, show shortened /config path
+my $shortened_load_file = get_short_config_path($load_file);
+print "Loading configuration from '$shortened_load_file'...\n";
+
my $cobj = new Vyatta::Config;
if (!defined($merge)) {
# "load" => use backend through API