diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-04-16 14:21:23 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-04-16 14:21:23 +0000 |
| commit | b566f4366ceb4832646f0f1ba4d76645807650f2 (patch) | |
| tree | 5c38e0d66d04663aa1b60e3862291b95781d8dc8 | |
| parent | b9b4b259712e45d2e1b02a092d841d74b8ff7c73 (diff) | |
| download | drakx-b566f4366ceb4832646f0f1ba4d76645807650f2.tar drakx-b566f4366ceb4832646f0f1ba4d76645807650f2.tar.gz drakx-b566f4366ceb4832646f0f1ba4d76645807650f2.tar.bz2 drakx-b566f4366ceb4832646f0f1ba4d76645807650f2.tar.xz drakx-b566f4366ceb4832646f0f1ba4d76645807650f2.zip | |
(read_grub_menu_lst) fix crash introduced in latest commit...
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 05dc7aa7e..4c96b712c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o fix crash + Version 12.28 - 15 April 2009 - diskdrake: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index cbdd7be3e..856b2a484 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -335,7 +335,7 @@ sub read_grub_menu_lst { #- sanitize foreach my $e (@{$b{entries}}) { if (member($e->{type}, 'other', 'grub_configfile')) { - eval { $e->{kernel_or_dev} = grub2dev($e->{rootnoverify} || $e->{grub_root}, $grub2dev); } + eval { $e->{kernel_or_dev} = grub2dev($e->{rootnoverify} || $e->{grub_root}, $grub2dev) }; $e->{keep_verbatim} = 1 unless $e->{kernel_or_dev}; } elsif ($e->{initrd}) { my $initrd; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1448db764..368d2ccc7 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- diskdrake: + o fix crash - windows boot partition is the active one (#49483) Version 12.28 - 15 April 2009 |