summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorOliver Tappe2007-05-28 23:53:13 +0200
committerOliver Tappe2007-05-28 23:53:13 +0200
commit186cc89e440017fc49907929105e0eb7ed31eaa9 (patch)
tree18040459f9bf1f85991673b4817384c8fb17aa85 /installer
parent* added support for 'local:'-URLs, which trigger the automatic start of a (diff)
downloadcore-186cc89e440017fc49907929105e0eb7ed31eaa9.tar.gz
core-186cc89e440017fc49907929105e0eb7ed31eaa9.tar.xz
core-186cc89e440017fc49907929105e0eb7ed31eaa9.zip
* part one of settings file related changes (ticket#122):
- 'settings.default' now lives in /opt/openslx/share - 'settings.local' has been renamed to 'settings' git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1103 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rw-r--r--installer/OpenSLX/OSSetup/Engine.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 9d7d31ab..4240c5f5 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -407,7 +407,7 @@ sub readDistroInfo
my $bootstrap_packages = $self->{distro}->{config}->{'bootstrap-packages'};
my $metapackager_packages
= $self->{distro}->{config}->{'metapackager-packages'};
- my $file = "$self->{'distro-info-dir'}/settings.local";
+ my $file = "$self->{'distro-info-dir'}/settings";
if (-e $file) {
vlog 2, "reading configuration file $file...";
my $config = slurpFile($file);