diff options
| author | Dirk von Suchodoletz | 2009-08-19 12:51:16 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-08-19 12:51:16 +0200 |
| commit | a6b1e6894fc5a18db73322a04f04118a5c32a2c6 (patch) | |
| tree | ea0b6652f62b6341fcb303139324e8cba282bc62 | |
| parent | Fix for removable device listing in vmchooser. (diff) | |
| download | core-a6b1e6894fc5a18db73322a04f04118a5c32a2c6.tar.gz core-a6b1e6894fc5a18db73322a04f04118a5c32a2c6.tar.xz core-a6b1e6894fc5a18db73322a04f04118a5c32a2c6.zip | |
No need for the uclibc-wrapper in stage4 any more ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3104 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | initramfs/stage3-stuff/etc/functions | 6 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/initramfs/stage3-stuff/etc/functions b/initramfs/stage3-stuff/etc/functions index 51f5173b..8f6a57d2 100644 --- a/initramfs/stage3-stuff/etc/functions +++ b/initramfs/stage3-stuff/etc/functions @@ -162,9 +162,9 @@ case "${proto}" in # for some reason cifs mounts cannot be pivoted :( #mount -n -o ${mntopt},user=guest,guest,file_mode=0755,dir_mode=0755 \ # -t ${proto} //${server}${srcpath} ${target} - d_mkrlscript entry boot.slx "uclibc-wrapper mount -n -o ${mntopt},guest,\ -user=guest,file_mode=0755,dir_mode=0755 -t ${proto} //${server}${srcpath} \ -${target#/mnt}" + d_mkrlscript entry boot.slx "/opt/openslx/uclib-rootfs/bin/mount -n \ +-o ${mntopt},guest,user=guest,file_mode=0755,dir_mode=0755 -t ${proto} \ +//${server}${srcpath} ${target#/mnt}" ;; esac } diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index e4e36da5..a49d447f 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -1103,12 +1103,8 @@ sub _copyUclibcRootfs # 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 - $uClibCmd = "ln -sf /opt/openslx/uclib-rootfs/lib/ld-uClibc.so.0"; + # 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); |