diff options
author | Dirk von Suchodoletz | 2009-08-18 21:32:27 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2009-08-18 21:32:27 +0200 |
commit | 796cf283e1cca6e17bbb7b80a5f797ff862f9956 (patch) | |
tree | c38248a98a3e92f505eed2e3b625e5089e3d992b /installer/OpenSLX/OSSetup | |
parent | * reduce verbosity. Should now be compatible with VirtualBox 2.x and (diff) | |
download | core-796cf283e1cca6e17bbb7b80a5f797ff862f9956.tar.gz core-796cf283e1cca6e17bbb7b80a5f797ff862f9956.tar.xz core-796cf283e1cca6e17bbb7b80a5f797ff862f9956.zip |
Fixing an ugly bug Olli pointed out in r3096, r3097 ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3099 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup')
-rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Base.pm | 6 | ||||
-rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 29 |
2 files changed, 27 insertions, 8 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm index 93e2fcaa..15c0a963 100644 --- a/installer/OpenSLX/OSSetup/Distro/Base.pm +++ b/installer/OpenSLX/OSSetup/Distro/Base.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2007 - OpenSLX GmbH +# Copyright (c) 2006..2009 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -223,9 +223,9 @@ sub getDefaultPathList sub addUclibLdconfig { my $self = shift; - my $ldpath = shift; + #my $ldpath = shift; - open(OUTFILE, ">", "$ldpath/etc/ld.so.conf.d/uclib.conf") + open(OUTFILE, ">", "/etc/ld.so.conf.d/uclib.conf") or die ("something went wrong"); print OUTFILE "/opt/openslx/uclib-rootfs/lib\n"; print OUTFILE "/opt/openslx/uclib-rootfs/usr/lib\n"; diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 1a59b4c3..e4e36da5 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -265,8 +265,19 @@ sub installVendorOS ) ); + # add the uclibs and tools to the stage1 and add them to library search + # path $self->_copyUclibcRootfs(); - $self->{distro}->updateDistroConfig(); + callInSubprocess( + sub { + $self->_callChrootedFunction({ + chrootDir => $self->{'vendor-os-path'}, + function => sub { + $self->{'distro'}->addUclibLdconfig(); + }, + updateConfig => 1, + }); + }); $self->_touchVendorOS(); $self->addInstalledVendorOSToConfigDB(); return; @@ -349,9 +360,19 @@ sub cloneVendorOS ) ); } - + # add the uclibs and tools to the stage1 and add them to library search + # path $self->_copyUclibcRootfs(); - $self->{distro}->updateDistroConfig(); + callInSubprocess( + sub { + $self->_callChrootedFunction({ + chrootDir => $self->{'vendor-os-path'}, + function => sub { + $self->{'distro'}->addUclibLdconfig(); + }, + updateConfig => 1, + }); + }); $self->_touchVendorOS(); $self->addInstalledVendorOSToConfigDB(); return; @@ -1098,8 +1119,6 @@ sub _copyUclibcRootfs close($rsyncFH) or die _tr("unable to copy to target '%s', giving up! (%s)", $target, $!); - # add the uclibs to the ld.so.conf - $distro->addUclibLdconfig($targetRoot); # write version of uclibc-rootfs original into a file in order to be # able to check the up-to-date state later (in the config-demuxer) |