diff options
| -rw-r--r-- | installer/OpenSLX/OSExport/FileSystem/NFS.pm | 6 | ||||
| -rw-r--r-- | installer/OpenSLX/OSExport/FileSystem/SquashFS.pm | 5 | ||||
| -rw-r--r-- | os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm | 7 | ||||
| -rw-r--r-- | os-plugins/plugins/bootsplash/XX_bootsplash.sh | 5 | ||||
| -rwxr-xr-x | os-plugins/plugins/bootsplash/files/bin/splashy.dyn | bin | 39988 -> 0 bytes | |||
| -rwxr-xr-x | os-plugins/plugins/bootsplash/files/bin/splashy_update.glibc | bin | 4048 -> 0 bytes |
6 files changed, 15 insertions, 8 deletions
diff --git a/installer/OpenSLX/OSExport/FileSystem/NFS.pm b/installer/OpenSLX/OSExport/FileSystem/NFS.pm index 86f7c128..4cb6c1b7 100644 --- a/installer/OpenSLX/OSExport/FileSystem/NFS.pm +++ b/installer/OpenSLX/OSExport/FileSystem/NFS.pm @@ -238,6 +238,7 @@ sub _copyUclibEnv { my $self = shift; my $target = shift; + my $targetRoot = $target; $target .= "/opt/openslx/uclib-rootfs"; @@ -262,6 +263,11 @@ sub _copyUclibEnv 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, $!); diff --git a/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm b/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm index fe70f8c2..12670dc4 100644 --- a/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm +++ b/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm @@ -213,6 +213,11 @@ sub _createSquashFS vlog(0, _tr("preparing stage1 to add uclib-rootfs...")); my $res = system("mkdir -p $source/opt/openslx/uclib-rootfs"); $res = system("mount -o ro --bind $uclibcRootfs $source/opt/openslx/uclib-rootfs"); + # 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 .= " $source/lib/ld-uClibc.so.0"; + system("$uClibCmd"); + if ($res) { die _tr( "unable to prepare addition of uclib-rootfs in '%s', giving up! (%s)", diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm index b266de8e..eeaf6707 100644 --- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm +++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm @@ -122,20 +122,15 @@ sub installationPhase $self->{openslxBasePath} = $info->{'openslx-base-path'}; my $splashyBinPath = "$self->{openslxBasePath}/lib/plugins/bootsplash/files/bin"; - my $uClibcPath = "$self->{openslxBasePath}/share/uclib-rootfs/lib"; my $pluginRepoPath = "$self->{pluginRepositoryPath}"; - # copy splashy_update into plugin-repo folder + # copy splashy(_update) into plugin-repo folder mkpath("$pluginRepoPath/bin"); mkpath("$pluginRepoPath/lib"); slxsystem("cp -a $splashyBinPath/* $pluginRepoPath/bin") == 0 or die _tr( "unable to copy splashy to $pluginRepoPath/bin" ); - slxsystem("cp -a $uClibcPath/libuClibc* $pluginRepoPath/lib") == 0 - or die _tr( - "unable to copy libuClibc to $pluginRepoPath/lib" - ); return; } diff --git a/os-plugins/plugins/bootsplash/XX_bootsplash.sh b/os-plugins/plugins/bootsplash/XX_bootsplash.sh index 4bd340fb..9a36c08f 100644 --- a/os-plugins/plugins/bootsplash/XX_bootsplash.sh +++ b/os-plugins/plugins/bootsplash/XX_bootsplash.sh @@ -20,8 +20,9 @@ if [ -e /initramfs/plugin-conf/bootsplash.conf ]; then if [ ${no_bootsplash} -eq 0 ]; then # create a runlevelscript that will stop splashy before the start of KDM d_mkrlscript init splashy.stop "Stopping Splashy ..." - echo -e "\t/opt/openslx/plugin-repo/bootsplash/bin/splashy_update.glibc\ - exit 2>/dev/null \ + echo -e "\tLD_LIBRARY_PATH=/opt/openslx/uclib-rootfs/lib/ + /opt/openslx/plugin-repo/bootsplash/bin/splashy_update exit \ + 2>/dev/null \ \n\ttype killall >/dev/null 2>&1 && killall -9 splashy \ \n\trm -f /etc/init.d/splashy.stop 2>/dev/null" \ >>/mnt/etc/init.d/splashy.stop diff --git a/os-plugins/plugins/bootsplash/files/bin/splashy.dyn b/os-plugins/plugins/bootsplash/files/bin/splashy.dyn Binary files differdeleted file mode 100755 index edd33bc8..00000000 --- a/os-plugins/plugins/bootsplash/files/bin/splashy.dyn +++ /dev/null diff --git a/os-plugins/plugins/bootsplash/files/bin/splashy_update.glibc b/os-plugins/plugins/bootsplash/files/bin/splashy_update.glibc Binary files differdeleted file mode 100755 index 0a7be6c8..00000000 --- a/os-plugins/plugins/bootsplash/files/bin/splashy_update.glibc +++ /dev/null |