From 2fe536b25f66c52a75ed8c53cd5f14d9e795d6a3 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 20 Apr 2019 11:02:52 +0100 Subject: Minimise calls to ped_disk_probe() when reading partition tables (mga#15752) --- perl-install/partition_table/dos.pm | 2 +- perl-install/partition_table/gpt.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/partition_table') diff --git a/perl-install/partition_table/dos.pm b/perl-install/partition_table/dos.pm index 51c82e108..3bcb226c4 100644 --- a/perl-install/partition_table/dos.pm +++ b/perl-install/partition_table/dos.pm @@ -238,7 +238,7 @@ sub read_one { sysread $F, $tmp, length $magic or die "error reading magic number on disk $hd->{device}"; $tmp eq $magic or die "bad magic number on disk $hd->{device}"; - if (c::get_disk_type($hd->{file}) ne "msdos") { + if ($hd->{current_pt_table_type} ne "dos") { # libparted may have ignored it because of overlapping partitions or other error # while it is actually a partition table. $hd->{fs_type_from_magic} and die "unpartitionned disk"; diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm index c155ed48e..e1c07a761 100644 --- a/perl-install/partition_table/gpt.pm +++ b/perl-install/partition_table/gpt.pm @@ -45,7 +45,7 @@ $rev_parted_mapping{vfat} = 'fat32'; sub read_one { my ($hd, $_sector) = @_; - c::get_disk_type($hd->{file}) eq "gpt" or die "$hd->{device} not a GPT disk ($hd->{file})"; + $hd->{current_pt_table_type} eq "gpt" or die "$hd->{device} not a GPT disk ($hd->{file})"; my @pt; foreach (c::get_disk_partitions($hd->{file})) { -- cgit v1.2.1