diff options
| author | Michael Janczyk | 2010-08-22 23:03:48 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2010-08-22 23:03:48 +0200 |
| commit | 19ec30d3e2e52d87ddde96c8ee9b99224aaa8586 (patch) | |
| tree | 46eaf198e882d473fe1f3a7d424ade08b4935de1 /os-plugins/plugins/bootsplash | |
| parent | Merge branch 'master' of openslx.org:openslx/core (diff) | |
| download | core-19ec30d3e2e52d87ddde96c8ee9b99224aaa8586.tar.gz core-19ec30d3e2e52d87ddde96c8ee9b99224aaa8586.tar.xz core-19ec30d3e2e52d87ddde96c8ee9b99224aaa8586.zip | |
changed to 50% ram for vbox and vmware
Diffstat (limited to 'os-plugins/plugins/bootsplash')
| -rw-r--r-- | os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm | 19 | ||||
| -rw-r--r-- | os-plugins/plugins/bootsplash/XX_bootsplash.sh | 4 |
2 files changed, 14 insertions, 9 deletions
diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm index ec58d132..ef1db778 100644 --- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm +++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm @@ -122,8 +122,8 @@ sub installationPhase $self->{pluginRepositoryPath} = $info->{'plugin-repo-path'}; $self->{openslxBasePath} = $info->{'openslx-base-path'}; - my $splashyBinPath = - "$self->{openslxBasePath}/lib/plugins/bootsplash/files/bin"; + my $splashyPath = + "$self->{openslxBasePath}/lib/plugins/bootsplash/files"; my $pluginRepoPath = "$self->{pluginRepositoryPath}"; my $initFile = newInitFile(); @@ -158,11 +158,14 @@ sub installationPhase ); # copy splashy(_update) into plugin-repo folder - mkpath("$pluginRepoPath/bin"); + mkpath("$pluginRepoPath/sbin"); mkpath("$pluginRepoPath/lib"); - slxsystem("cp -a $splashyBinPath/* $pluginRepoPath/bin") == 0 + mkpath("$pluginRepoPath/usr/lib"); + slxsystem("cp -a $splashyPath/sbin/* $pluginRepoPath/sbin/; + cp -p $splashyPath/lib/* $pluginRepoPath/lib/; + cp -p $splashyPath/usr/lib/* $pluginRepoPath/usr/lib/") == 0 or die _tr( - "unable to copy splashy to $pluginRepoPath/bin" + "unable to copy splashy to $pluginRepoPath" ); # create a proper (distro specific) runlevel script for halt #my $initfile = newInitFile(); @@ -205,9 +208,11 @@ sub copyRequiredFilesIntoInitramfs $splashyThemeDir = "$altThemeDir"; } if (-d $splashyThemeDir) { - my $splashyPath = "$bootsplashDir/files/bin"; + my $splashyPath = "$bootsplashDir/files"; $makeInitRamFSEngine->addCMD( - "cp -p $splashyPath/splashy* $targetPath/bin/" + "cp -p $splashyPath/sbin/splashy* $targetPath/sbin/; + cp -p $splashyPath/lib/lib* $targetPath/lib/; + cp -p $splashyPath/usr/lib/lib* $targetPath/usr/lib/" ); $makeInitRamFSEngine->addCMD( "mkdir -p $targetPath/etc/splashy/themes" diff --git a/os-plugins/plugins/bootsplash/XX_bootsplash.sh b/os-plugins/plugins/bootsplash/XX_bootsplash.sh index 77ae7bac..372e025d 100644 --- a/os-plugins/plugins/bootsplash/XX_bootsplash.sh +++ b/os-plugins/plugins/bootsplash/XX_bootsplash.sh @@ -21,7 +21,7 @@ if [ -e /initramfs/plugin-conf/bootsplash.conf ]; then # create a runlevelscript that will stop splashy before the start of KDM d_mkrlscript init splashy.boot "" echo -e "\tLD_LIBRARY_PATH=/opt/openslx/uclib-rootfs/lib/ \ - /opt/openslx/plugin-repo/bootsplash/bin/splashy_update \ + /opt/openslx/plugin-repo/bootsplash/sbin/splashy_update \ exit 2>/dev/null \ \n\ttype killall >/dev/null 2>&1 && killall -9 splashy" \ >>/mnt/etc/init.d/splashy.boot @@ -42,7 +42,7 @@ if [ -e /initramfs/plugin-conf/bootsplash.conf ]; then -e "s,#0x42#,# shutdown splashy - added by splashy plugin\n\t#0x42#," \ -e "s,#0x42#,if [ ! \"x$(ps aux |grep splashy |grep -v grep | wc -l)\" -eq \"x0\" ]; then\n\t#0x42#, " \ -e "s,#0x42#, LD_LIBRARY_PATH=/opt/openslx/uclib-rootfs/lib/ \\\\\n\t#0x42#," \ - -e "s,#0x42#, /opt/openslx/plugin-repo/bootsplash/bin/splashy_update exit \\\\\n\t#0x42#," \ + -e "s,#0x42#, /opt/openslx/plugin-repo/bootsplash/sbin/splashy_update exit \\\\\n\t#0x42#," \ -e "s,#0x42#, 2>/dev/null \n\t#0x42#," \ -e "s,#0x42#,fi \n\t#0x42#," \ -e "s,#0x42#,#splashy-stop-done#," \ |