- ensure someone can't set a mount point on a non formatted ntfs partition

- remove the mount point when destructive resizing and isNonMountable

2 files changed, 5 insertions, 1 deletions

diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 95f0aa2bc..86772c108 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -739,6 +739,7 @@ sub Resize {
 	$part->{notFormatted} = 1;
 	$part->{isFormatted} = 0;
 	partition_table::verifyParts($hd);
+	$part->{mntpoint} = '' if isNonMountable($part); #- mainly for ntfs, which we can't format
     }
 
     $adjust->(0) if $size < $oldsize;
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 0cd11e489..b468c8174 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -248,7 +248,10 @@ sub isTrueFS { member(type2fs($_[0]), qw(ext2 reiserfs xfs jfs ext3)) }
 
 sub isOtherAvailableFS { isFat_or_NTFS($_[0]) || isSunOS($_[0]) || isThisFs('hfs', $_[0]) } #- other OS that linux can access its filesystem
 sub isMountableRW { (isTrueFS($_[0]) || isOtherAvailableFS($_[0])) && !isThisFs('ntfs', $_[0]) }
-sub isNonMountable { isRawRAID($_[0]) || isRawLVM($_[0]) }
+sub isNonMountable { 
+    my ($part) = @_;
+    isRawRAID($part) || isRawLVM($part) || isThisFs("ntfs", $part) && !$part->{isFormatted} && $part->{notFormatted};
+}
 
 sub isPartOfLVM { defined $_[0]{lvm} }
 sub isPartOfRAID { defined $_[0]{raid} }