From 1ea3578bfb4c6b4ef7b3854ce4561d8bc9afaef4 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 17 Sep 2004 10:33:54 +0000 Subject: try to get geometry from EDD --- perl-install/partition_table/raw.pm | 46 ++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'perl-install/partition_table/raw.pm') diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm index 8cbe0ec14..59ca08906 100644 --- a/perl-install/partition_table/raw.pm +++ b/perl-install/partition_table/raw.pm @@ -94,7 +94,51 @@ sub compute_nb_cylinders { $geom->{cylinders} = int $totalsectors / $geom->{heads} / $geom->{sectors}; } -sub get_geometry($) { +sub keep_non_duplicates { + my %l; + $l{$_->[0]}++ foreach @_; + map { @$_ } grep { $l{$_->[0]} == 1 } @_; +} + +sub get_geometries { + my ($hds) = @_; + + foreach my $hd (@$hds) { + my $h = get_geometry($hd->{file}) or log::l("An error occurred while getting the geometry of block device $hd->{file}: $!"), next; + add2hash_($hd, $h); + } + + my %id2hd = keep_non_duplicates(map { + my $F = openit($_) or die "failed to open device $_->{device}"; + my $tmp; + if (c::lseek_sector(fileno($F), 0, 0x1b8) && sysread($F, $tmp, 4)) { + [ sprintf('0x%08x', unpack('V', $tmp)), $_ ]; + } else { + (); + } + } @$hds); + + + my %id2edd = keep_non_duplicates(map { [ chomp_(cat_("$_/mbr_signature")), $_ ] } glob("/sys/firmware/edd/int13_dev*")); + + log::l("id2hd: " . join(' ', map_each { "$::a=>$::b->{device}" } %id2hd)); + log::l("id2edd: " . join(' ', map_each { "$::a=>$::b" } %id2edd)); + + foreach my $id (keys %id2hd) { + my $hd = $id2hd{$id}; + $hd->{volume_id} = $id; + + if (my $edd_dir = $id2edd{$id}) { + $hd->{bios_from_edd} = $1 if $edd_dir =~ /int13_dev(.*)/; + + require partition_table::dos; + my $geom = partition_table::dos::geometry_from_edd($hd, $edd_dir); + $hd->{geom} = $geom if $geom; + } + } +} + +sub get_geometry { my ($dev) = @_; my $g = ""; -- cgit v1.2.1