diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-dev/attachments/20120405/9fb53a02 | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20120405/9fb53a02')
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20120405/9fb53a02/attachment-0001.obj | 21 | ||||
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20120405/9fb53a02/attachment.obj | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20120405/9fb53a02/attachment-0001.obj b/zarb-ml/mageia-dev/attachments/20120405/9fb53a02/attachment-0001.obj new file mode 100644 index 000000000..c9bb54c4b --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120405/9fb53a02/attachment-0001.obj @@ -0,0 +1,21 @@ +diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm +index 1613cd0..51ebb1f 100644 +--- a/perl-install/bootloader.pm ++++ b/perl-install/bootloader.pm +@@ -161,8 +161,15 @@ sub add_boot_splash { + sub update_splash { + my ($bootloader) = @_; + ++ my %real_initrd_entries; + foreach (@{$bootloader->{entries}}) { +- add_boot_splash($_->{initrd}, $_->{vga} || $bootloader->{vga}) if $_->{initrd}; ++ if ($_->{initrd}) { ++ my $initrd = expand_symlinks($_->{initrd}); ++ $real_initrd_entries{$initrd} = $_; ++ } ++ } ++ foreach (values %real_initrd_entries) { ++ add_boot_splash($_->{initrd}, $_->{vga} || $bootloader->{vga}); + } + } +
\ No newline at end of file diff --git a/zarb-ml/mageia-dev/attachments/20120405/9fb53a02/attachment.obj b/zarb-ml/mageia-dev/attachments/20120405/9fb53a02/attachment.obj new file mode 100644 index 000000000..c9bb54c4b --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120405/9fb53a02/attachment.obj @@ -0,0 +1,21 @@ +diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm +index 1613cd0..51ebb1f 100644 +--- a/perl-install/bootloader.pm ++++ b/perl-install/bootloader.pm +@@ -161,8 +161,15 @@ sub add_boot_splash { + sub update_splash { + my ($bootloader) = @_; + ++ my %real_initrd_entries; + foreach (@{$bootloader->{entries}}) { +- add_boot_splash($_->{initrd}, $_->{vga} || $bootloader->{vga}) if $_->{initrd}; ++ if ($_->{initrd}) { ++ my $initrd = expand_symlinks($_->{initrd}); ++ $real_initrd_entries{$initrd} = $_; ++ } ++ } ++ foreach (values %real_initrd_entries) { ++ add_boot_splash($_->{initrd}, $_->{vga} || $bootloader->{vga}); + } + } +
\ No newline at end of file |