summaryrefslogtreecommitdiff
path: root/scripts/vyatta-load-config.pl
diff options
context:
space:
mode:
authorrbalocca <rbalocca@fugazi.vyatta.com>2007-12-18 14:18:24 -0800
committerrbalocca <rbalocca@fugazi.vyatta.com>2007-12-18 14:18:24 -0800
commit64a8cfa9effac219e51498c3b8ef43437ad0396a (patch)
treefb11fa4d01b3dbe1f0f60e838b4ec450cbf31a64 /scripts/vyatta-load-config.pl
parent65db98116efa3c311c798f05f4f6ec97e9b6d643 (diff)
parent7966b8cf00e08548447e551a3fcfde40aa06cc59 (diff)
downloadvyatta-cfg-64a8cfa9effac219e51498c3b8ef43437ad0396a.tar.gz
vyatta-cfg-64a8cfa9effac219e51498c3b8ef43437ad0396a.zip
Merge branch 'master' into glendale
Diffstat (limited to 'scripts/vyatta-load-config.pl')
-rwxr-xr-xscripts/vyatta-load-config.pl6
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/vyatta-load-config.pl b/scripts/vyatta-load-config.pl
index a6f037a..d011a65 100755
--- a/scripts/vyatta-load-config.pl
+++ b/scripts/vyatta-load-config.pl
@@ -8,11 +8,7 @@ use VyattaConfigLoad;
my $etcdir = $ENV{vyatta_sysconfdir};
my $sbindir = $ENV{vyatta_sbindir};
-my $bootpath = '';
-if (-r "$etcdir/bootfile_path") {
- $bootpath = `cat $etcdir/bootfile_path`;
-}
-$bootpath =~ s/\/[^\/]+$//;
+my $bootpath = $etcdir . "/config";
if ($#ARGV != 0) {
print "Usage: load <config_file_name>\n";