summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-18 13:05:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-18 13:05:37 +0000
commitb8277bac0fae66c5cdb13d4b50af505aa4c16c18 (patch)
tree192bca4728cada850e0c51130f49c0a25249340f
parent074fc4bfaa48a3d853d029a1b0326b9bb763813f (diff)
downloaddrakx-backup-do-not-use-b8277bac0fae66c5cdb13d4b50af505aa4c16c18.tar
drakx-backup-do-not-use-b8277bac0fae66c5cdb13d4b50af505aa4c16c18.tar.gz
drakx-backup-do-not-use-b8277bac0fae66c5cdb13d4b50af505aa4c16c18.tar.bz2
drakx-backup-do-not-use-b8277bac0fae66c5cdb13d4b50af505aa4c16c18.tar.xz
drakx-backup-do-not-use-b8277bac0fae66c5cdb13d4b50af505aa4c16c18.zip
- ensure someone can't set a mount point on a non formatted ntfs partition
- remove the mount point when destructive resizing and isNonMountable
-rw-r--r--perl-install/diskdrake/interactive.pm1
-rw-r--r--perl-install/partition_table.pm5
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} }