diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-06-05 08:57:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-06-05 08:57:50 +0000 |
| commit | 17b40f8aa6c759a71240d795bfe6a05bf18c5c92 (patch) | |
| tree | 622cf97a5f984800fc001d17217bd9c1062656c4 | |
| parent | 8cd616ce3484089b0f9f07778d3c53f2a4203d4b (diff) | |
| download | drakx-17b40f8aa6c759a71240d795bfe6a05bf18c5c92.tar drakx-17b40f8aa6c759a71240d795bfe6a05bf18c5c92.tar.gz drakx-17b40f8aa6c759a71240d795bfe6a05bf18c5c92.tar.bz2 drakx-17b40f8aa6c759a71240d795bfe6a05bf18c5c92.tar.xz drakx-17b40f8aa6c759a71240d795bfe6a05bf18c5c92.zip | |
- bootloader-config:
o handle kernel-xen-uptodate (#31154)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 2a226165f..ed0071531 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- bootloader-config: + o handle kernel-xen-uptodate (#31154) + Version 10.4.132 - 05 June 2007, by Thierry Vignaud - fix some UTF8 issue (#31067) (notably drakbug) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 7c3eab5ad..44c75d3a1 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -604,7 +604,9 @@ sub build_mbootpack { sub add_kernel { my ($bootloader, $kernel_str, $v, $b_nolink, $b_no_initrd) = @_; - if (short_ext($kernel_str) eq 'xen' && -f '/boot/xen.gz') { + #- eg: for /boot/vmlinuz-2.6.17-13mdvxen0 (pkg kernel-xen0-xxx) + #- or /boot/vmlinuz-2.6.18-xen (pkg kernel-xen-uptodate) + if ($kernel_str->{version} =~ /xen/ && -f '/boot/xen.gz') { $v->{xen} = '/boot/xen.gz'; } |