From 32948630ab8b20b422c4cba738c3ed812a40b798 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Thu, 12 Feb 2009 15:19:26 +0000
Subject: fix a crash when boot device is not removable
---
perl-install/Makefile.config | 2 +-
perl-install/bootloader.pm | 2 +-
perl-install/install/NEWS | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 4ddad997f..8c05f662c 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
# -*- Makefile -*-
-VERSION:=11.84
+VERSION:=11.85
SUDO = sudo
TMPDIR = /tmp
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c0245852c..d92344a22 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -983,7 +983,7 @@ sub suggest {
if ($root_part->{is_removable}) {
$mbr = fs::get::part2hd($root_part, $all_hds);
} else {
- $mbr = find { !$_->{is_removable} } $all_hds->{hds};
+ $mbr = find { !$_->{is_removable} } @{$all_hds->{hds}};
}
my ($onmbr, $unsafe) = $bootloader->{crushMbr} ? (1, 0) : suggest_onmbr($mbr);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4c42a57a9..b4e8596db 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+Version 11.85 - 12 February 2009
+
+- fix a crash when boot device is not removable
+
Version 11.84 - 12 February 2009
- handle newer module-init-tools which can put relative path in modules.dep
--
cgit v1.2.1