diff options
Diffstat (limited to 'perl-install/partition_table')
-rw-r--r-- | perl-install/partition_table/empty.pm | 2 | ||||
-rw-r--r-- | perl-install/partition_table/raw.pm | 19 |
2 files changed, 3 insertions, 18 deletions
diff --git a/perl-install/partition_table/empty.pm b/perl-install/partition_table/empty.pm index fb2d8ada3..fe4550f47 100644 --- a/perl-install/partition_table/empty.pm +++ b/perl-install/partition_table/empty.pm @@ -28,7 +28,7 @@ sub read_one { 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::clear($hd); + partition_table::initialize($hd); $hd->{primary}{raw}, $hd->{primary}{info}; } diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm index 95317cf72..096e36ccd 100644 --- a/perl-install/partition_table/raw.pm +++ b/perl-install/partition_table/raw.pm @@ -215,22 +215,7 @@ sub default_type { $type; } -sub zero_MBR { &clear } #- deprecated -sub clear { - my ($hd, $o_type) = @_; - - my $type = $o_type || default_type(); - - require "partition_table/$type.pm"; - "partition_table::$type"->initialize($hd); - - delete $hd->{extended}; - if (detect_devices::is_xbox()) { - my $part = { start => 1, size => 15632048, pt_type => 0x0bf, isFormatted => 1 }; - partition_table::dos::compute_CHS($hd, $part); - $hd->{primary}{raw}[0] = $part; - } -} +sub zero_MBR { &partition_table::initialize } #- deprecated sub clear_existing { my ($hd) = @_; @@ -242,7 +227,7 @@ sub zero_MBR_and_dirty { &clear_and_dirty } #- deprecated sub clear_and_dirty { my ($hd) = @_; $hd->clear_existing; - clear($hd); + partition_table::initialize($hd); } sub read_primary { |