summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-10-14 16:39:30 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-10-14 16:39:30 +0000
commit8c9118f1b7794a5c75cfbde2146bb6070556aba2 (patch)
tree7701a9a49f7e0adb74a1fa95ef95c30b3a59a703
parentf68735953294e98729fb8deefdbc02a0430720c2 (diff)
downloaddrakx-8c9118f1b7794a5c75cfbde2146bb6070556aba2.tar
drakx-8c9118f1b7794a5c75cfbde2146bb6070556aba2.tar.gz
drakx-8c9118f1b7794a5c75cfbde2146bb6070556aba2.tar.bz2
drakx-8c9118f1b7794a5c75cfbde2146bb6070556aba2.tar.xz
drakx-8c9118f1b7794a5c75cfbde2146bb6070556aba2.zip
do not link /boot/vmlinuz to xen while allowing a unversioned /boot/vmlinuz-xen
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm3
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8814ac737..f43be82af 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,6 +5,7 @@
- use UTF-8 for zh_TW (#53976)
- bootloader:
o use initrd-2.6.30.2-xen-5mdv.img instead of initrd-xen-2.6.30.2-xen-5mdv.img
+ o do not link /boot/vmlinuz to xen while allowing a unversioned /boot/vmlinuz-xen
Version 12.64 - 12 October 2009
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c07fa6dc2..83a9bada1 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -722,6 +722,9 @@ sub add_kernel {
$b_nolink ||= $kernel_str->{use_long_name};
+ #- do not link /boot/vmlinuz to xen
+ $b_nolink ||= $v->{xen};
+
my $vmlinuz_long = kernel_str2vmlinuz_long($kernel_str);
my $initrd_long = kernel_str2initrd_long($kernel_str);
$v->{kernel_or_dev} = "/boot/$vmlinuz_long";