From b323dd3df0352e75bd2bacf544246797e83ce6ae Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 19 Sep 2007 13:50:11 +0000
Subject: o handle /boot/xxx files on linux raid1

---
 perl-install/NEWS          | 2 ++
 perl-install/bootloader.pm | 5 +++++
 perl-install/install/NEWS  | 1 +
 3 files changed, 8 insertions(+)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index e878ca98a..3374a2f25 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- bootloader-config:
+  o handle /boot/xxx files on linux raid1
 - fix getting UUID on mdmadm (eg: md0) devices
 - getInputDevices(): keep "Bus=..." for drakx-kbd-mouse-x11
 
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index decb3a1d0..4cfad778f 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1434,6 +1434,11 @@ sub device_string2grub {
 }
 sub device2grub {
     my ($device, $sorted_hds) = @_;
+
+    if (isRAID($device) && $device->{level} == 1) {
+	#- we can take any disk
+	$device = $device->{disks}[0];
+    }
     my ($hd, $part_nb) = 
       $device->{rootDevice} ?
 	(fs::get::device2part($device->{rootDevice}, $sorted_hds), $device->{device} =~ /(\d+)$/) :
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 76985e3ef..cc170ee83 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- handle /boot/xxx files on linux raid1
 - when basesystem can't be selected, display the reason
 - also load dm-zero for dmraid
 - add RC2 banner
-- 
cgit v1.2.1