summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-30 17:10:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-30 17:10:14 +0000
commit6e542cadc04a8da43b5a1290273b7d123b015c53 (patch)
tree6dff6b9cf7627157fd808abeca8ee767cef670f8
parent8ad91da4fc1accb8ebf7a98943d7064141a1dc69 (diff)
downloaddrakx-6e542cadc04a8da43b5a1290273b7d123b015c53.tar
drakx-6e542cadc04a8da43b5a1290273b7d123b015c53.tar.gz
drakx-6e542cadc04a8da43b5a1290273b7d123b015c53.tar.bz2
drakx-6e542cadc04a8da43b5a1290273b7d123b015c53.tar.xz
drakx-6e542cadc04a8da43b5a1290273b7d123b015c53.zip
- bootloader-config, drakboot
o fix dropping "chainloader" and "configfile" entries (#44045) (at last!)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 34315d4da..3a87c5b88 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,7 @@
o do not migrate non sdx/hdx to UUID (bootloader config)
o do migrate dmraid device names to UUID
(because of xxx1 vs xxxp1 device name issue, cf #44182)
+ o fix dropping "chainloader" and "configfile" entries (#44045)
- reduce banner font size
Version 11.60 - 30 September 2008
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index ce5054d62..45311d095 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -331,7 +331,7 @@ sub read_grub_menu_lst {
#- sanitize
foreach my $e (@{$b{entries}}) {
- if (member($e->{type}, 'chainloader', 'configfile')) {
+ if (member($e->{type}, 'other', 'grub_configfile')) {
$e->{kernel_or_dev} = grub2dev($e->{rootnoverify} || $e->{grub_root}, $grub2dev);
} elsif ($e->{initrd}) {
$e->{initrd} = grub2file($e->{initrd}, $grub2dev, $fstab, $e);