summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-10-29 00:29:02 +0000
committerOlivier Blin <oblin@mandriva.com>2008-10-29 00:29:02 +0000
commitc59fb74be2f4ba755f0a2d51d2d067a08a3da7cf (patch)
tree5c711658281f7166265650d83d0b30f81523f562
parent7f734cec799c0e17b497a6b8920fdabcaed610c7 (diff)
downloaddrakiso-c59fb74be2f4ba755f0a2d51d2d067a08a3da7cf.tar
drakiso-c59fb74be2f4ba755f0a2d51d2d067a08a3da7cf.tar.gz
drakiso-c59fb74be2f4ba755f0a2d51d2d067a08a3da7cf.tar.bz2
drakiso-c59fb74be2f4ba755f0a2d51d2d067a08a3da7cf.tar.xz
drakiso-c59fb74be2f4ba755f0a2d51d2d067a08a3da7cf.zip
pass initrd path directly
-rw-r--r--lib/MDV/Draklive/Initrd.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm
index c856e84..eb001fe 100644
--- a/lib/MDV/Draklive/Initrd.pm
+++ b/lib/MDV/Draklive/Initrd.pm
@@ -173,7 +173,7 @@ sub create_initrd_for_media {
my $initrd = $live->get_builddir . $live->{prefix}{build}{boot} . $media->get_initrd_path;
compress_initrd_tree($live, $media, $initrd_tree, $initrd);
- add_splash($live, $media);
+ add_splash($live, $initrd);
}
sub create_initrd_scriptlet {
@@ -247,10 +247,9 @@ sub compress_initrd_tree {
}
sub add_splash {
- my ($live, $media) = @_;
+ my ($live, $initrd) = @_;
if ($live->{system}{vga_mode} && $live->{system}{splash} ne 'no') {
require bootloader;
- my $initrd = $live->get_builddir . $live->{prefix}{build}{boot} . $media->get_initrd_path;
my $tmp_initrd = '/tmp/initrd.gz';
cp_f($initrd, $live->get_system_root . $tmp_initrd);
{