summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-10-19 11:40:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-10-19 11:40:37 +0000
commit2267901bf77bbe16b5a391d7469fe2f7d9db68d0 (patch)
tree77f1675b08ec95bbbf04f0e361503e5240a3bcaa
parentd25f08bee430e5418edbdb0405899dce9e3a0590 (diff)
downloaddrakx-2267901bf77bbe16b5a391d7469fe2f7d9db68d0.tar
drakx-2267901bf77bbe16b5a391d7469fe2f7d9db68d0.tar.gz
drakx-2267901bf77bbe16b5a391d7469fe2f7d9db68d0.tar.bz2
drakx-2267901bf77bbe16b5a391d7469fe2f7d9db68d0.tar.xz
drakx-2267901bf77bbe16b5a391d7469fe2f7d9db68d0.zip
- writing partition table now works
- creating a new partition table now works (except GUIDs generation)
-rw-r--r--perl-install/partition_table_gpt.pm139
1 files changed, 97 insertions, 42 deletions
diff --git a/perl-install/partition_table_gpt.pm b/perl-install/partition_table_gpt.pm
index 55bc1a49f..fa9668fd8 100644
--- a/perl-install/partition_table_gpt.pm
+++ b/perl-install/partition_table_gpt.pm
@@ -77,102 +77,157 @@ sub compute_headerCRC32 {
crc32(pack($main_format, @$info{@$main_fields}));
}
-sub read {
- my ($hd, $sector) = @_;
+sub read_header {
+ my ($sector, $F) = @_;
my $tmp;
- my $l = partition_table_dos::read($hd, $sector);
- my @l = grep { $_->{size} && $_->{type} && !partition_table::isExtended($_) } @$l;
- @l == 1 or die "bad PMBR";
- $l[0]{type} == 0xee or die "bad PMBR";
- my $myLBA = $l[0]{start};
-
- local *F; partition_table_raw::openit($hd, *F) or die "failed to open device";
- c::lseek_sector(fileno(F), $myLBA, 0) or die "reading of partition in sector $sector failed";
+ c::lseek_sector(fileno($F), $sector, 0) or die "reading of partition in sector $sector failed";
- sysread F, $tmp, psizeof($main_format) or die "error while reading partition table in sector $sector";
+ sysread $F, $tmp, psizeof($main_format) or die "error while reading partition table in sector $sector";
my %info; @info{@$main_fields} = unpack $main_format, $tmp;
$info{magic} eq $magic or die "bad magic number";
- $info{myLBA} == $myLBA or die "myLBA is not the same";
+ $info{myLBA} == $sector or die "myLBA is not the same";
$info{headerSize} == psizeof($main_format) or die "bad partition table header size";
$info{partitionEntrySize} == psizeof($partitionEntry_format) or die "bad partitionEntrySize";
$info{revision} <= $current_revision or log::l("oops, this is a new GPT revision ($info{revision} > $current_revision)");
$info{headerCRC32} == compute_headerCRC32(\%info) or die "bad partition table checksum";
+ \%info
+}
+
+sub read_partitionEntries {
+ my ($info, $F) = @_;
+ my $tmp;
- c::lseek_sector(fileno(F), $info{partitionEntriesLBA}, 0) or die "can't seek to sector partitionEntriesLBA";
- sysread F, $tmp, psizeof($partitionEntry_format) * $info{nbPartitions} or die "error while reading partition table in sector $sector";
- $info{partitionEntriesCRC32} == crc32($tmp) or die "bad partition entries checksum";
+ c::lseek_sector(fileno($F), $info->{partitionEntriesLBA}, 0) or die "can't seek to sector partitionEntriesLBA";
+ sysread $F, $tmp, psizeof($partitionEntry_format) * $info->{nbPartitions} or die "error while reading partition table in sector $info->{partitionEntriesLBA}";
+ $info->{partitionEntriesCRC32} == crc32($tmp) or die "bad partition entries checksum";
- c::lseek_sector(fileno(F), $info{partitionEntriesLBA}, 0) or die "can't seek to sector partitionEntriesLBA";
+ c::lseek_sector(fileno($F), $info->{partitionEntriesLBA}, 0) or die "can't seek to sector partitionEntriesLBA";
my %gpt_types_rev = reverse %gpt_types;
my @pt =
- grep { $_->{size} && $_->{type} } #- compress empty partitions as kernel skip them
map {
- sysread F, $tmp, psizeof($partitionEntry_format) or die "error while reading partition table in sector $sector";
+ sysread $F, $tmp, psizeof($partitionEntry_format) or die "error while reading partition table in sector $info->{partitionEntriesLBA}";
my %h; @h{@$partitionEntry_fields} = unpack $partitionEntry_format, $tmp;
$h{size} = $h{ending} - $h{start};
$h{type} = $gpt_types_rev{$h{gpt_type}};
$h{type} = 0x100 if !defined $h{type};
\%h;
- } (1 .. $info{nbPartitions});
+ } (1 .. $info->{nbPartitions});
+ \@pt;
+}
+
+sub read {
+ my ($hd, $sector) = @_;
+ my $tmp;
- [ @pt ], \%info;
+ my $l = partition_table_dos::read($hd, $sector);
+ my @l = grep { $_->{size} && $_->{type} && !partition_table::isExtended($_) } @$l;
+ @l == 1 or die "bad PMBR";
+ $l[0]{type} == 0xee or die "bad PMBR";
+ my $myLBA = $l[0]{start};
+
+ local *F; partition_table_raw::openit($hd, *F) or die "failed to open device";
+ my $info1 = eval { read_header($myLBA, *F) };
+ my $info2 = eval { read_header($info1->{alternateLBA} || $l[0]{start} + $l[0]{size} - 1, *F) }; #- what about using $hd->{totalsectors} ???
+ my $info = $info1 || { %$info2, myLBA => $info2->{alternateLBA}, alternateLBA => $info2->{myLBA}, partitionEntriesLBA => $info2->{alternateLBA} + 1 } or die;
+ my $pt = $info1 && $info2 ?
+ eval { $info1 && read_partitionEntries($info1, *F) } || read_partitionEntries($info2, *F) :
+ read_partitionEntries($info, *F);
+ $hd->raw_removed($pt);
+
+ $pt, $info;
}
# write the partition table (and extended ones)
# for each entry, it uses fields: start, size, type, active
sub write {
- my ($hd, undef, $pt, $info) = @_;
+ my ($hd, $sector, $pt, $info) = @_;
- local *F;
- partition_table_raw::openit($hd, *F, 2) or die "error opening device $hd->{device} for writing";
-
foreach (@$pt) {
$_->{ending} = $_->{start} + $_->{size};
$_->{gpt_type} = $gpt_types{$_->{type}} || $_->{gpt_type} || $gpt_types{0x83};
}
+ my $partitionEntries = join('', map {
+ pack($partitionEntry_format, @$_{@$partitionEntry_fields})
+ } (@$pt, ({}) x ($info->{nbPartitions} - @$pt)));
+
+ $info->{partitionEntriesCRC32} = crc32($partitionEntries);
+ $info->{headerCRC32} = compute_headerCRC32($info);
+
+ my $info2 = { %$info,
+ myLBA => $info->{alternateLBA}, alternateLBA => $info->{myLBA},
+ partitionEntriesLBA => $info->{alternateLBA} - psizeof($partitionEntry_format) * $info->{nbPartitions} / 512,
+ };
+ $info2->{headerCRC32} = compute_headerCRC32($info2);
+
+ {
+ # write the PMBR
+ my $pmbr = partition_table_dos::clear_raw();
+ $pmbr->{raw}[0] = { type => 0xee, local_start => $info->{myLBA}, size => $info->{alternateLBA} - $info->{myLBA} + 1 };
+ partition_table_dos::write($hd, $sector, $pmbr->{raw});
+ }
- $info->{csum} = compute_crc($info);
-
+ local *F;
+ partition_table_raw::openit($hd, *F, 2) or die "error opening device $hd->{device} for writing";
+
c::lseek_sector(fileno(F), $info->{myLBA}, 0) or return 0;
#- pad with 0's
syswrite F, pack($main_format, @$info{@$main_fields}) . "\0" x 512, 512 or return 0;
- c::lseek_sector(fileno(F), $info->{myLBA}, 0) or return 0;
+ c::lseek_sector(fileno(F), $info->{alternateLBA}, 0) or return 0;
+ #- pad with 0's
+ syswrite F, pack($main_format, @$info2{@$main_fields}) . "\0" x 512, 512 or return 0;
+
+ c::lseek_sector(fileno(F), $info->{partitionEntriesLBA}, 0) or return 0;
+ syswrite F, $partitionEntries or return 0;
+ c::lseek_sector(fileno(F), $info2->{partitionEntriesLBA}, 0) or return 0;
+ syswrite F, $partitionEntries or return 0;
common::sync();
1;
}
+sub raw_removed {
+ my ($hd, $raw) = @_;
+ @$raw = grep { $_->{size} && $_->{type} } @$raw;
+}
+sub can_raw_add {
+ my ($hd) = @_;
+ @{$hd->{primary}{raw}} < $hd->{primary}{info}{nbPartitions};
+}
+sub raw_add {
+ my ($hd, $raw, $part) = @_;
+ $hd->can_raw_add or die "raw_add: partition table already full";
+ push @$raw, $part;
+}
+
sub info {
my ($hd) = @_;
+ my $nb_sect = 32;
#- build a default suitable partition table,
#- checksum will be built when writing on disk.
- my $info = {
+ {
magic => $magic,
- revision => $current_revision
+ revision => $current_revision,
+ headerSize => psizeof($main_format),
+ myLBA => 1,
+ alternateLBA => $hd->{totalsectors} - 1,
+ firstUsableLBA => $nb_sect + 2,
+ lastUsableLBA => $hd->{totalsectors} - $nb_sect - 2,
+ guid => 'TODO',
+ partitionEntriesLBA => 2,
+ nbPartitions => $nb_sect * 512 / psizeof($partitionEntry_format),
+ partitionEntrySize => psizeof($partitionEntry_format),
};
-
- $info;
}
sub clear_raw {
my ($hd) = @_;
- my $pt = { raw => [ ({}) x 128 ], info => info($hd) };
-
- #- handle special case for partition 2 which is whole disk.
- $pt->{raw}[2] = {
- type => 5, #- the whole disk type.
- flags => 0,
- start_cylinder => 0,
- size => $hd->{geom}{cylinders} * $hd->cylinder_size(),
- };
-
- $pt;
+ { raw => [], info => info($hd) };
}
1;