summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-27 07:19:10 -0400
committerThomas Backlund <tmb@mageia.org>2015-03-27 22:32:50 +0159
commit00b61be8e2bc2fda4a848fe7af38e7d7543d322f (patch)
tree9ca2d9cb105962237e647e02ce284fcf9de7cd13
parentfc666ca8b327b3b1dda653f5238e6844f019faf7 (diff)
downloaddrakx-00b61be8e2bc2fda4a848fe7af38e7d7543d322f.tar
drakx-00b61be8e2bc2fda4a848fe7af38e7d7543d322f.tar.gz
drakx-00b61be8e2bc2fda4a848fe7af38e7d7543d322f.tar.bz2
drakx-00b61be8e2bc2fda4a848fe7af38e7d7543d322f.tar.xz
drakx-00b61be8e2bc2fda4a848fe7af38e7d7543d322f.zip
fix tagging swap as "linux filesystem" with GPT
libparted needs it to be named like this in order to put the right GUID...
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/partition_table/gpt.pm1
3 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index df345b2db..71b4a64a2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- diskdrake (GPT):
o fix retrieving LVM/RAID partition type
+ o fix tagging swap as "linux filesystem"
Version 16.71 - 25 March 2015
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4b80fff97..8135ab7b3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- GPT partitionning:
o fix retrieving LVM/RAID partition type
+ o fix tagging swap as "linux filesystem"
- tell users to ignore Gtk3 warnings
Version 16.72 - 26 March 2015
diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm
index dc169c183..cad7e6073 100644
--- a/perl-install/partition_table/gpt.pm
+++ b/perl-install/partition_table/gpt.pm
@@ -145,6 +145,7 @@ sub write {
my ($part) = grep { $_->{start} == $o_start && $_->{size} == $o_size } @$pt;
print "($action, $part_number, $o_start, $o_size)\n";
if ($action eq 'add') {
+ local $part->{fs_type} = 'linux-swap(v1)' if isSwap($part->{fs_type});
c::disk_add_partition($hd->{file}, $o_start, $o_size, $part->{fs_type}) or die "failed to add partition #$part_number on $hd->{file}";
if (isESP($part)) {
c::set_partition_flag($hd->{file}, $part_number, 'ESP')