From a30f811f574cd5b0e743115a91e5f1282279f947 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 19 Jul 2009 11:20:42 +0000
Subject: Installing uclibc-wrapper into vendor os (to have it available in
 stage4).

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3017 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/OpenSLX/OSSetup/Engine.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'installer/OpenSLX/OSSetup/Engine.pm')

diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 6a2697d2..9eee6ce0 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -1075,10 +1075,15 @@ sub _copyUclibcRootfs
     my $rsyncCmd
         = "rsync -aq --delete-excluded --exclude-from=- $uclibcRootfs/ $target";
     vlog(2, "executing: $rsyncCmd\n");
-    # if we're doing a fresh install we need to create /lib first
-    slxsystem("mkdir -p $targetRoot/lib");
+    # if we're doing a fresh install we need to create /lib, /bin first
+    mkdir "$targetRoot/lib";
+    mkdir "$targetRoot/bin";
+    # copy uclibc-wrapper into the standard bin directory of the vendor os
+    my $uClibCmd = "cp $openslxConfig{'base-path'}/bin/uclibc-wrapper";
+    $uClibCmd .= " $targetRoot/bin";
+    system($uClibCmd);
     # 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 = "ln -sf /opt/openslx/uclib-rootfs/lib/ld-uClibc.so.0";
     $uClibCmd .= " $targetRoot/lib/ld-uClibc.so.0";
     system($uClibCmd);
 
-- 
cgit v1.2.3-55-g7522