summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-27 09:47:13 -0400
committerThomas Backlund <tmb@mageia.org>2015-03-27 22:32:59 +0159
commit6deb0e59982c923021492993bb6ed134183ce494 (patch)
tree0996e7510f0fe3ff2bb940549ac8e98e1fa9ce01
parentcec8a8ea2a524a6f9e5ea42750b9f0f54df873ce (diff)
downloaddrakx-6deb0e59982c923021492993bb6ed134183ce494.tar
drakx-6deb0e59982c923021492993bb6ed134183ce494.tar.gz
drakx-6deb0e59982c923021492993bb6ed134183ce494.tar.bz2
drakx-6deb0e59982c923021492993bb6ed134183ce494.tar.xz
drakx-6deb0e59982c923021492993bb6ed134183ce494.zip
fix fs_type returned by libparted for swaps
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/partition_table/gpt.pm1
3 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d2bfdf634..8f2a47200 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,5 @@
- diskdrake (GPT):
- o fix retrieving LVM/RAID partition type
+ o fix retrieving LVM/RAID/swap partition type
o fix tagging lvm/raid as "linux filesystem"
o fix tagging ntfs-3g as "linux filesystem"
o fix tagging swap as "linux filesystem"
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 99a64610a..25812d616 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,5 @@
- GPT partitionning:
- o fix retrieving LVM/RAID partition type
+ o fix retrieving LVM/RAID/swap partition type
o fix tagging lvm/raid as "linux filesystem"
o fix tagging ntfs-3g as "linux filesystem"
o fix tagging swap as "linux filesystem"
diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm
index 5dec99630..1ac296946 100644
--- a/perl-install/partition_table/gpt.pm
+++ b/perl-install/partition_table/gpt.pm
@@ -118,6 +118,7 @@ sub read_one {
} elsif (c::get_partition_flag($hd->{file}, $_->{part_number}, 'RAID')) {
$_->{pt_type} = 0xfd;
}
+ $part->{fs_type} = 'swap' if $part->{fs_type} eq 'linux-swap(v1)';
@pt[$_->{part_number}-1] = $_;
}