diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-10-06 09:45:11 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-10-06 09:45:11 +0000 |
| commit | 52d1522ecbbfd413aca9fd8a037117056dc15920 (patch) | |
| tree | 692e3888a8b5973985196562f5b77abad4083efc | |
| parent | 42983d15d736fff28c80ecb88c8af50bb2ee2627 (diff) | |
| download | drakx-52d1522ecbbfd413aca9fd8a037117056dc15920.tar drakx-52d1522ecbbfd413aca9fd8a037117056dc15920.tar.gz drakx-52d1522ecbbfd413aca9fd8a037117056dc15920.tar.bz2 drakx-52d1522ecbbfd413aca9fd8a037117056dc15920.tar.xz drakx-52d1522ecbbfd413aca9fd8a037117056dc15920.zip | |
do not do anything anymore with bootsplash.cfg
| -rw-r--r-- | images/NEWS | 2 | ||||
| -rwxr-xr-x | images/make_boot_img | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/images/NEWS b/images/NEWS index 0278d319a..99a2fb668 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- do not do anything anymore with bootsplash.cfg + Version 1.43 - 22 September 2009, by Olivier Blin - fix firmware loading (#49195) diff --git a/images/make_boot_img b/images/make_boot_img index 60906f4c5..c0159b103 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -139,7 +139,7 @@ EOF } sub initrd { - my ($type, $I, $img, $o_bootsplash_cfg) = @_; + my ($type, $I, $img) = @_; my $stage1_root = $ENV{DEBUGSTAGE1} ? "../mdk-stage1" : "/usr/$lib/drakx-installer-binaries"; my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; @@ -210,10 +210,6 @@ fi symlink('busybox', $tmp_initrd . "/sbin/$_") foreach @funct; } - if ($o_bootsplash_cfg) { - _ "splash -s -f $o_bootsplash_cfg > $tmp_initrd/bootsplash"; - } - my $devs = sprintf "ls /dev/{%s}", join(',', qw(console fb0 fd0 loop3 mem null ppp ptmx ptyp0 ram3 random tty[0-7] ttyp0 ttyS0 urandom)); _ "(cd $tmp_initrd; (find . ; $devs) | cpio -o -c --quiet) | gzip -9 > $img"; @@ -705,13 +701,11 @@ sub syslinux_all_files { $default_vga =~ /788/ or die 'we rely on vga=788 for bootsplash'; my $theme = $ENV{THEME} || 'Mandriva-Free'; - my $bootsplash_cfg = "/etc/bootsplash/themes/$theme/config/bootsplash-800x600.cfg"; - -e $bootsplash_cfg or die "can't find $bootsplash_cfg"; each_index { mkdir "$dir/alt$::i", 0777; _ "cp all.kernels/$_/vmlinuz $dir/alt$::i"; - initrd('all', '', "images/all.rdz-$_", $bootsplash_cfg); + initrd('all', '', "images/all.rdz-$_"); rename("images/all.rdz-$_", "$dir/alt$::i/all.rdz"); } @$kernels; |