diff options
| author | Colin Guthrie <colin@mageia.org> | 2012-09-01 15:47:19 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2012-09-01 15:47:19 +0000 |
| commit | 84779a4ad529caf0afa666a2a05978d72316340a (patch) | |
| tree | bb8af71fa5adeed85c4f38a3fed0d770e6cfc35b | |
| parent | b19cfe25e416028f891b28b692817d529a1cc016 (diff) | |
| download | drakx-84779a4ad529caf0afa666a2a05978d72316340a.tar drakx-84779a4ad529caf0afa666a2a05978d72316340a.tar.gz drakx-84779a4ad529caf0afa666a2a05978d72316340a.tar.bz2 drakx-84779a4ad529caf0afa666a2a05978d72316340a.tar.xz drakx-84779a4ad529caf0afa666a2a05978d72316340a.zip | |
(update_splash) Only expand initrd symlinks for kernels with vga=nnn arguments
When working out which initrds to regenerate, it is likely that the
same initrd symlink is used by multiple bootloader entries (i.e.
typically the initrd.img symlinked initrd is used by both the current
and the failsafe entry).
If the earlier entry does have vga= but the latter entry does not,
then the latter entry will end up being the value used when
checking the vga= argument when deciding if the initrd
needs to be regenerated.
Thus we only expand the symlink if the vga= value is set
which means that any initrd that needs to be regenerated
definitely will be regenerated.
This will hopefully solve the problem seen on mga2 when
and updated theme package had to be pushed but the initrds
didn't seem to be updated.
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 537d721e2..6d7edc587 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- boodloader: + o ensure initrds used in combination with kernels with vga= arguments + are regenerated when needed - adapt to usbfs death - drakxservices: o fix checking systemd presence after systemd merge of subpackages diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 2f32baff5..d3c6b97e4 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -176,7 +176,7 @@ sub update_splash { my %real_initrd_entries; foreach (@{$bootloader->{entries}}) { - if ($_->{initrd}) { + if ($_->{initrd} && $_->{vga}) { my $initrd = expand_symlinks($_->{initrd}); $real_initrd_entries{$initrd} = $_; } |