summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-09-09 11:44:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-09-09 11:44:27 +0000
commit7c61b9baf0806d9824ea87d23a6373ec48580b0d (patch)
treec9f015eebb5c82c41c1de279701ce09341323f3b
parentf020c0ea4b3b1cf6c7a83799b44d707173c18f81 (diff)
downloaddrakx-backup-do-not-use-7c61b9baf0806d9824ea87d23a6373ec48580b0d.tar
drakx-backup-do-not-use-7c61b9baf0806d9824ea87d23a6373ec48580b0d.tar.gz
drakx-backup-do-not-use-7c61b9baf0806d9824ea87d23a6373ec48580b0d.tar.bz2
drakx-backup-do-not-use-7c61b9baf0806d9824ea87d23a6373ec48580b0d.tar.xz
drakx-backup-do-not-use-7c61b9baf0806d9824ea87d23a6373ec48580b0d.zip
fix detection of mixed_kind_of_disks (eg: hde with hda)
-rw-r--r--perl-install/any.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 9aaabc615..abec5ea8a 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -93,7 +93,7 @@ sub setupBootloader {
my $prev_boot = $b->{boot};
my $mixed_kind_of_disks =
(grep { $_->{device} =~ /^sd/ } @$hds) && (grep { $_->{device} =~ /^hd/ } @$hds) ||
- (grep { $_->{device} =~ /^hd[fghi]/ } @$hds) && (grep { $_->{device} =~ /^hd[abcd]/ } @$hds);
+ (grep { $_->{device} =~ /^hd[e-z]/ } @$hds) && (grep { $_->{device} =~ /^hd[a-d]/ } @$hds);
if ($mixed_kind_of_disks) {
$automatic = $semi_auto = 0;
@@ -225,14 +225,15 @@ sub setupBootloader {
delete $b->{bios} if $b->{boot} ne $prev_boot;
if ($mixed_kind_of_disks &&
-# $b->{boot} !~ /$hds->[0]{device}/ && #- not the first disk
$b->{boot} =~ /\d$/ && #- on a partition
is_empty_hash_ref($b->{bios}) && #- some bios mapping already there
arch() !~ /ppc/) {
+ log::l("mixed_kind_of_disks");
my $hd = $in->ask_from_listf('', _("You decided to install the bootloader on a partition.
This implies you already have a bootloader on the hard drive you boot (eg: System Commander).
On which drive are you booting?"), \&partition_table::description, $hds) or goto &setupBootloader;
+ log::l("mixed_kind_of_disks chosen $hd->{device}");
$b->{first_hd_device} = "/dev/$hd->{device}";
}