From 7c61b9baf0806d9824ea87d23a6373ec48580b0d Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 9 Sep 2002 11:44:27 +0000 Subject: fix detection of mixed_kind_of_disks (eg: hde with hda) --- perl-install/any.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'perl-install') 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}"; } -- cgit v1.2.1