diff options
| author | Oliver Tappe | 2008-04-07 21:12:56 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2008-04-07 21:12:56 +0200 |
| commit | bd58d9eee8265248408c4f432284377414459125 (patch) | |
| tree | 59e86d09290e614bb96d0783c49c8b4df6760710 /os-plugins | |
| parent | config.xml which sets splashy theme is now generated via demuxer. The theme d... (diff) | |
| download | core-bd58d9eee8265248408c4f432284377414459125.tar.gz core-bd58d9eee8265248408c4f432284377414459125.tar.xz core-bd58d9eee8265248408c4f432284377414459125.zip | |
* avoid use of temporary file in copyRequiredFilesIntoInitramfs
* minor cosmetics
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1726 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm index 1604e271..ad5596a9 100644 --- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm +++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm @@ -136,6 +136,15 @@ sub copyRequiredFilesIntoInitramfs } if (-d $splashyThemeDir) { my $splashyPath = "$bootsplashDir/files/bin"; + $makeInitRamFSEngine->addCMD( + "cp -p $splashyPath/splashy* $targetPath/bin/" + ); + $makeInitRamFSEngine->addCMD( + "mkdir -p $targetPath/etc/splashy/themes" + ); + $makeInitRamFSEngine->addCMD( + "cp -a $splashyThemeDir $targetPath/etc/splashy/themes/" + ); my $defSplashyTheme = "/etc/splashy/themes/$bootsplashTheme"; my $splashyConfig = unshiftHereDoc(<<" End-of-Here"); <?xml version="1.0" encoding="UTF-8"?> @@ -151,32 +160,17 @@ sub copyRequiredFilesIntoInitramfs <fifo>/dev/.initramfs/splashy.fifo</fifo> </splashy> End-of-Here - spitFile("$bootsplashConfigDir/config.xml", $splashyConfig); - $makeInitRamFSEngine->addCMD( - "cp -p $splashyPath/splashy* $targetPath/bin/" - ); - $makeInitRamFSEngine->addCMD( - "mkdir -p $targetPath/etc/splashy/themes" - ); - $makeInitRamFSEngine->addCMD( - "cp -a $bootsplashConfigDir/config.xml $targetPath/etc/splashy/" - ); - $makeInitRamFSEngine->addCMD( - "cp -a $splashyThemeDir $targetPath/etc/splashy/themes/" - ); + $makeInitRamFSEngine->addCMD( { + file => "$bootsplashConfigDir/config.xml", + content => $splashyConfig, + } ); } } else { $bootsplashTheme = '<none>'; } - vlog( - 1, - _tr( - "bootsplash-plugin: bootsplash=%s", - $bootsplashTheme - ) - ); + vlog(1, _tr("bootsplash-plugin: bootsplash=%s", $bootsplashTheme)); return; } |