diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-19 13:50:11 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-19 13:50:11 +0000 |
| commit | b323dd3df0352e75bd2bacf544246797e83ce6ae (patch) | |
| tree | 14e84c35b1192975842578348eab09e57b9744db | |
| parent | 41e7a8dc76cc90cc741304a3bbf6188aef135cfa (diff) | |
| download | drakx-backup-do-not-use-b323dd3df0352e75bd2bacf544246797e83ce6ae.tar drakx-backup-do-not-use-b323dd3df0352e75bd2bacf544246797e83ce6ae.tar.gz drakx-backup-do-not-use-b323dd3df0352e75bd2bacf544246797e83ce6ae.tar.bz2 drakx-backup-do-not-use-b323dd3df0352e75bd2bacf544246797e83ce6ae.tar.xz drakx-backup-do-not-use-b323dd3df0352e75bd2bacf544246797e83ce6ae.zip | |
o handle /boot/xxx files on linux raid1
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 8 insertions, 0 deletions
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 |