summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorOliver Tappe2007-04-29 19:57:53 +0200
committerOliver Tappe2007-04-29 19:57:53 +0200
commite11776e6c5da6a0c675eb428053533f64a485fc3 (patch)
tree175528b59a0c21bd972c57637f4b06d497126af6 /installer
parentAdd support to install suse 10.1 x86_64 with slxos-setup. (diff)
downloadcore-e11776e6c5da6a0c675eb428053533f64a485fc3.tar.gz
core-e11776e6c5da6a0c675eb428053533f64a485fc3.tar.xz
core-e11776e6c5da6a0c675eb428053533f64a485fc3.zip
* cosmetical changes
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@959 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rw-r--r--installer/OpenSLX/OSSetup/Engine.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index a9692c0d..0c80fc93 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -340,7 +340,7 @@ sub readDistroInfo
my $bootstrap_packages = $self->{distro}->{config}->{'bootstrap-packages'};
my $file = "$self->{'distro-info-dir'}/settings.local";
if (-e $file) {
- vlog 3, "reading configuration file $file...";
+ vlog 2, "reading configuration file $file...";
my $config = slurpFile($file);
if (!eval $config && length($@)) {
die _tr("error in config-file '%s' (%s)", $file, $@)."\n";
@@ -478,7 +478,7 @@ sub stage1A_createBusyboxEnvironment
foreach my $lib (split "\n", $requiredLibsStr) {
vlog 3, "copying lib '$lib'";
my $libDir = dirname($lib);
- copyFile($lib, "$self->{stage1aDir}/$libDir");
+ copyFile($lib, "$self->{stage1aDir}$libDir");
if ($lib =~ m[/libc.so.\d\s*$]) {
# note target folder of libc, as we need to copy the resolver libs
# into the same place:
@@ -509,12 +509,12 @@ sub stage1A_setupResolver
if (!defined $libcFolder) {
warn _tr("unable to determine libc-target-folder, will use /lib!");
- $libcFolder = 'lib';
+ $libcFolder = '/lib';
}
copyFile('/etc/resolv.conf', "$self->{stage1aDir}/etc");
- copyFile("/$libcFolder/libresolv*", "$self->{stage1aDir}/$libcFolder");
- copyFile("/$libcFolder/libnss_dns*", "$self->{stage1aDir}/$libcFolder");
+ copyFile("$libcFolder/libresolv*", "$self->{stage1aDir}$libcFolder");
+ copyFile("$libcFolder/libnss_dns*", "$self->{stage1aDir}$libcFolder");
my $stage1cDir
= "$self->{'stage1aDir'}/$self->{'stage1bSubdir'}/$self->{'stage1cSubdir'}";