summaryrefslogtreecommitdiffstats
path: root/installer/OpenSLX/OSSetup/Engine.pm
diff options
context:
space:
mode:
authorDirk von Suchodoletz2010-08-22 23:58:24 +0200
committerDirk von Suchodoletz2010-08-22 23:58:24 +0200
commit4a44e76cea9bea78b24a6a995b9951fd47cdc7fe (patch)
treea5b00f37c0dd48ec36d2cecc19224691b29c929a /installer/OpenSLX/OSSetup/Engine.pm
parentAvoid warning of missing modules for initramfs creation (Ubuntu). (diff)
downloadcore-4a44e76cea9bea78b24a6a995b9951fd47cdc7fe.tar.gz
core-4a44e76cea9bea78b24a6a995b9951fd47cdc7fe.tar.xz
core-4a44e76cea9bea78b24a6a995b9951fd47cdc7fe.zip
Permission problem of d-------- for opt/openslx in stage1 should be
fixed.
Diffstat (limited to 'installer/OpenSLX/OSSetup/Engine.pm')
-rw-r--r--installer/OpenSLX/OSSetup/Engine.pm19
1 files changed, 2 insertions, 17 deletions
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index fad2ad98..642a058b 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -384,19 +384,8 @@ sub cloneVendorOS
# generate default openslx directories for the client
$self->_generateDefaultDirs();
- # add the uclibs and tools to the stage1 and add them to library search
- # path
+ # add the uclibs and tools to the stage1
$self->_copyUclibcRootfs();
- #callInSubprocess(
- # sub {
- # $self->_callChrootedFunction({
- # chrootDir => $self->{'vendor-os-path'},
- # function => sub {
- # $self->{'distro'}->addUclibLdconfig();
- # },
- # updateConfig => 1,
- # });
- #});
$self->_touchVendorOS();
$self->addInstalledVendorOSToConfigDB();
return;
@@ -1119,6 +1108,7 @@ sub _generateDefaultDirs
mkpath("$targetRoot/$OPENSLX_DEFAULT_BINDIR", 0, 0755);
mkpath("$targetRoot/$OPENSLX_DEFAULT_LIBDIR", 0, 0755);
mkpath("$targetRoot/$OPENSLX_DEFAULT_VIRTDIR", 0, 0755);
+ #system("chmod 0755 $targetRoot/$OPENSLX_DEFAULT_DIR");
my $openslxConfig = "# Default OpenSLX directories defined by satge 1\n";
$openslxConfig .= "# Version 0.2\n\n";
@@ -1161,7 +1151,6 @@ sub _copyUclibcRootfs
kexec
libcurses.so*
libncurses.so*
- strace
);
my $exclOpts = join ' ', map { "--exclude $_" } @excludes;
vlog(3, _tr("using exclude-filter:\n%s\n", $exclOpts));
@@ -1172,10 +1161,6 @@ sub _copyUclibcRootfs
# if we're doing a fresh install we need to create /lib, /bin first
mkdir "$targetRoot/lib";
mkdir "$targetRoot/bin";
- # link uClibc from the uclib-rootfs to /lib to make tools working
- my $uClibCmd = "ln -sf /opt/openslx/uclib-rootfs/lib/ld-uClibc.so.0";
- $uClibCmd .= " $targetRoot/lib/ld-uClibc.so.0";
- system($uClibCmd);
open($rsyncFH, '|-', $rsyncCmd)
or die _tr("unable to start rsync for source '%s', giving up! (%s)",