From fd0c659539609be48af980e6201c262bfcd9aa57 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 24 May 2015 12:11:27 +0200 Subject: set pt_type according to fs_type before flag cases (mga#16029) --- perl-install/partition_table/gpt.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'perl-install/partition_table') diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm index 332889e1f..d07b634d0 100644 --- a/perl-install/partition_table/gpt.pm +++ b/perl-install/partition_table/gpt.pm @@ -120,6 +120,11 @@ sub read_one { my @pt; # FIXME: just use '@pt = map { ... } c::...' if part_numbers are always linear: foreach (c::get_disk_partitions($hd->{file})) { + # compatibility with MBR partitions tables: + $_->{pt_type} = 0x82 if $_->{fs_type} eq 'swap'; + $_->{pt_type} = 0x0b if $_->{fs_type} eq 'vfat'; + $_->{pt_type} = 0x83 if $_->{fs_type} =~ /^ext/; + # fix detecting ESP (special case are they're detected through pt_type): if ($_->{flag} eq 'ESP') { $_->{pt_type} = 0xef; @@ -132,11 +137,6 @@ sub read_one { } $_->{fs_type} = $parted_mapping{$_->{fs_type}} if $parted_mapping{$_->{fs_type}}; - # compatibility with MBR partitions tables: - $_->{pt_type} = 0x82 if $_->{fs_type} eq 'swap'; - $_->{pt_type} = 0x0b if $_->{fs_type} eq 'vfat'; - $_->{pt_type} = 0x83 if $_->{fs_type} =~ /^ext/; - @pt[$_->{part_number}-1] = $_; } -- cgit v1.2.1