summaryrefslogtreecommitdiffstats
path: root/perl-install/partition_table/empty.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/partition_table/empty.pm')
-rw-r--r--perl-install/partition_table/empty.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/partition_table/empty.pm b/perl-install/partition_table/empty.pm
index e90991684..fe4ad4317 100644
--- a/perl-install/partition_table/empty.pm
+++ b/perl-install/partition_table/empty.pm
@@ -1,7 +1,7 @@
-package partition_table::empty; # $Id$
+package partition_table::empty;
#- this is a mainly dummy partition table. If we find it's empty, we just call -
-#- zero_MBR which will take care of bless'ing us to the partition table type best
+#- ->clear which will take care of bless'ing us to the partition table type best
#- suited
@@ -17,20 +17,20 @@ use partition_table;
use c;
-sub read($$) {
+sub read_one {
my ($hd, $sector) = @_;
my $tmp;
- local *F; partition_table::raw::openit($hd, *F) or die "failed to open device";
- c::lseek_sector(fileno(F), $sector, 0) or die "reading of partition in sector $sector failed";
+ my $F = partition_table::raw::openit($hd) or die "failed to open device";
+ c::lseek_sector(fileno($F), $sector, 0) or die "reading of partition in sector $sector failed";
#- check magic number
- sysread F, $tmp, 512 or die "error reading magic number on disk $hd->{device}";
- $tmp eq substr($tmp, 0, 1) x 512 or die "bad magic number on disk $hd->{device}";
+ sysread $F, $tmp, 1024 or die "error reading magic number on disk $hd->{device}";
+ $tmp eq substr($tmp, 0, 1) x 1024 or die "bad magic number on disk $hd->{device}";
- partition_table::raw::zero_MBR($hd);
+ partition_table::initialize($hd);
- $hd->{primary}{raw};
+ $hd->{primary}{raw}, $hd->{primary}{info};
}
1;