From 096efb38194c5b662a9466a09a4be4b1fb28a117 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 6 Mar 2009 16:31:58 +0000 Subject: working at #393: * moved copying of uclibc-rootfs from stage2 (export) to stage1 (vendor-OS) git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2692 95ad53e4-c205-0410-b2fa-d234c58c8868 --- installer/OpenSLX/OSExport/FileSystem/NFS.pm | 46 +--------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) (limited to 'installer/OpenSLX/OSExport/FileSystem/NFS.pm') diff --git a/installer/OpenSLX/OSExport/FileSystem/NFS.pm b/installer/OpenSLX/OSExport/FileSystem/NFS.pm index 4cb6c1b7..b9d88689 100644 --- a/installer/OpenSLX/OSExport/FileSystem/NFS.pm +++ b/installer/OpenSLX/OSExport/FileSystem/NFS.pm @@ -61,7 +61,7 @@ sub exportVendorOS } $self->_copyViaRsync($source, $target); - $self->_copyUclibEnv($target); + return; } @@ -234,48 +234,4 @@ sub _isTargetBindMounted return 0; } -sub _copyUclibEnv -{ - my $self = shift; - my $target = shift; - my $targetRoot = $target; - - $target .= "/opt/openslx/uclib-rootfs"; - - if (system("mkdir -p $target")) { - die _tr("unable to create directory '%s', giving up! (%s)\n", - $target, $!); - } - - my $uclibcRootfs = "$openslxConfig{'base-path'}/share/uclib-rootfs"; - my @excludes = qw( - dialog - kexec - libcurses.so* - libncurses.so* - mconf - strace - ); - my $exclOpts = join ' ', map { "--exclude $_" } @excludes; - my $includeExcludeList = $self->_determineIncludeExcludeList(); - vlog(1, _tr("using exclude-filter:\n%s\n", $exclOpts)); - my $rsyncFH; - my $rsyncCmd - = "rsync -av --delete-excluded --exclude-from=-" . " $uclibcRootfs/ $target"; - vlog(2, "executing: $rsyncCmd\n"); - # link uClibc from the uclib-rootfs to /lib to make LD_PRELOAD=... 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)", - $uclibcRootfs, $!); - print $rsyncFH $exclOpts; - close($rsyncFH) - or die _tr("unable to copy to target '%s', giving up! (%s)", - $target, $!); - return; -} - 1; -- cgit v1.2.3-55-g7522