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/20120404/32fe00a8 | |
| 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/20120404/32fe00a8')
4 files changed, 54 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment-0001.html b/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment-0001.html new file mode 100644 index 000000000..f5fa7c475 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment-0001.html @@ -0,0 +1,5 @@ +<br><br><div class="gmail_quote">On Wed, Apr 4, 2012 at 14:40, Anssi Hannula <span dir="ltr"><<a href="mailto:anssi@mageia.org">anssi@mageia.org</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + +Yes (it has always been like that). Feel free to fix <a href="http://bootloader.pm" target="_blank">bootloader.pm</a> to<br> +not do it. Note, however, that you can't simply skip symlinks there as<br> +the initrd.img symlink may also be the only initrd in bootloader config.</blockquote><div><br></div><div>What about this (untested)? </div></div> diff --git a/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment-0001.obj b/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment-0001.obj new file mode 100644 index 000000000..0fab4a60a --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment-0001.obj @@ -0,0 +1,22 @@ +Index: bootloader.pm +=================================================================== +--- bootloader.pm (revision 3913) ++++ bootloader.pm (working copy) +@@ -161,9 +161,16 @@ + 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; ++ $real_initrd_entries[$initrd] = $_; ++ } + } ++ foreach (values %real_initrd_entries) { ++ add_boot_splash($_->{initrd}, $_->{vga} || $bootloader->{vga}); ++ } + } + + sub read {
\ No newline at end of file diff --git a/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment.html b/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment.html new file mode 100644 index 000000000..f5fa7c475 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment.html @@ -0,0 +1,5 @@ +<br><br><div class="gmail_quote">On Wed, Apr 4, 2012 at 14:40, Anssi Hannula <span dir="ltr"><<a href="mailto:anssi@mageia.org">anssi@mageia.org</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + +Yes (it has always been like that). Feel free to fix <a href="http://bootloader.pm" target="_blank">bootloader.pm</a> to<br> +not do it. Note, however, that you can't simply skip symlinks there as<br> +the initrd.img symlink may also be the only initrd in bootloader config.</blockquote><div><br></div><div>What about this (untested)? </div></div> diff --git a/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment.obj b/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment.obj new file mode 100644 index 000000000..0fab4a60a --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120404/32fe00a8/attachment.obj @@ -0,0 +1,22 @@ +Index: bootloader.pm +=================================================================== +--- bootloader.pm (revision 3913) ++++ bootloader.pm (working copy) +@@ -161,9 +161,16 @@ + 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; ++ $real_initrd_entries[$initrd] = $_; ++ } + } ++ foreach (values %real_initrd_entries) { ++ add_boot_splash($_->{initrd}, $_->{vga} || $bootloader->{vga}); ++ } + } + + sub read {
\ No newline at end of file |