summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-20 08:35:12 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-20 18:34:47 +0200
commit1e4b61c23a81e19e6fd62893b136fd0bde9b55ab (patch)
tree44e76ec0917c716785e778f54ce9578a29238c4c
parent916e112f0d5fe753be24db15bc8555f8058699f0 (diff)
downloaddrakx-1e4b61c23a81e19e6fd62893b136fd0bde9b55ab.tar
drakx-1e4b61c23a81e19e6fd62893b136fd0bde9b55ab.tar.gz
drakx-1e4b61c23a81e19e6fd62893b136fd0bde9b55ab.tar.bz2
drakx-1e4b61c23a81e19e6fd62893b136fd0bde9b55ab.tar.xz
drakx-1e4b61c23a81e19e6fd62893b136fd0bde9b55ab.zip
display cosmetics when reading back GPT
let's diskdrake show the same types as for MBR partitions. to be cleaned once we switch to libparted for everything...
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/partition_table/gpt.pm6
3 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e040d2c9c..de025fcfe 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- diskdrake:
+ o display cosmetics when reading back GPT partitions
o fix mnt point for FAT partitions on GTP (mga#15987)
o set the proper GUID for FAT partitions on GPT
- drakboot:
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d76bb8f9e..0a06768a9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- bootloader:
+ o display cosmetics when reading back GPT partitions
o do not detect grub2 on UEFI when there's no bootloader
o fix default grub2 kernel parameters (mga#15984)
- partitioning:
diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm
index 161ea621a..332889e1f 100644
--- a/perl-install/partition_table/gpt.pm
+++ b/perl-install/partition_table/gpt.pm
@@ -131,6 +131,12 @@ sub read_one {
$_->{pt_type} = 0x12;
}
$_->{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] = $_;
}