From fff307ac3e81281d98fa33c078264cbb7812f237 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 18 Sep 2007 10:37:15 +0000 Subject: create pt_info_to_primary() out of partition_table::read_one() --- perl-install/partition_table/raw.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'perl-install/partition_table') diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm index d1549239d..e2fd7e949 100644 --- a/perl-install/partition_table/raw.pm +++ b/perl-install/partition_table/raw.pm @@ -6,6 +6,7 @@ use strict; use common; use devices; use detect_devices; +use fs::type; use log; use c; @@ -235,6 +236,19 @@ sub zero_MBR_and_dirty { zero_MBR($hd); } +sub pt_info_to_primary { + my ($hd, $pt, $info) = @_; + + my @extended = $hd->hasExtended ? grep { isExtended($_) } @$pt : (); + my @normal = grep { $_->{size} && !isEmpty($_) && !isExtended($_) } @$pt; + my $nb_special_empty = int(grep { $_->{size} && isEmpty($_) } @$pt); + + @extended > 1 and die "more than one extended partition"; + + put_in_hash($_, partition_table::hd2minimal_part($hd)) foreach @normal, @extended; + { raw => $pt, extended => $extended[0], normal => \@normal, info => $info, nb_special_empty => $nb_special_empty }; +} + #- ugly stuff needed mainly for Western Digital IDE drives #- try writing what we've just read, yells if it fails #- testing on last sector of head #0 (unused in 99% cases) -- cgit v1.2.1