summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-27 07:31:26 -0400
committerThomas Backlund <tmb@mageia.org>2015-03-27 22:32:52 +0159
commit22350abfdb8e85c05aba5f22278e76a02bc336f2 (patch)
tree1ed27e150f9e653c83f7745a6aeeb39965cd2358
parent00b61be8e2bc2fda4a848fe7af38e7d7543d322f (diff)
downloaddrakx-22350abfdb8e85c05aba5f22278e76a02bc336f2.tar
drakx-22350abfdb8e85c05aba5f22278e76a02bc336f2.tar.gz
drakx-22350abfdb8e85c05aba5f22278e76a02bc336f2.tar.bz2
drakx-22350abfdb8e85c05aba5f22278e76a02bc336f2.tar.xz
drakx-22350abfdb8e85c05aba5f22278e76a02bc336f2.zip
fix tagging ntfs-3g as "linux filesystem" with GPT
libparted needs it to be named like this in order to put the right
-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 71b4a64a2..4ec599045 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 ntfs-3g as "linux filesystem"
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 8135ab7b3..e642174bd 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 ntfs-3g as "linux filesystem"
o fix tagging swap as "linux filesystem"
- tell users to ignore Gtk3 warnings
diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm
index cad7e6073..dde111151 100644
--- a/perl-install/partition_table/gpt.pm
+++ b/perl-install/partition_table/gpt.pm
@@ -146,6 +146,7 @@ sub write {
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});
+ local $part->{fs_type} = 'ntfs' if $part->{fs_type} eq 'ntfs-3g';
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')