summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-18 14:21:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-18 14:21:00 +0000
commit3d3edeb0186cc696d1749b4e61304cfd7b958bfb (patch)
tree3763d180e430c660c2e1e1060fe72cddce76402c /perl-install
parentdfd77a5ef5d5443794045fbb24357edcb40202b2 (diff)
downloaddrakx-3d3edeb0186cc696d1749b4e61304cfd7b958bfb.tar
drakx-3d3edeb0186cc696d1749b4e61304cfd7b958bfb.tar.gz
drakx-3d3edeb0186cc696d1749b4e61304cfd7b958bfb.tar.bz2
drakx-3d3edeb0186cc696d1749b4e61304cfd7b958bfb.tar.xz
drakx-3d3edeb0186cc696d1749b4e61304cfd7b958bfb.zip
- create cannotBeMountable() out of isNonMountable()
- use it
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs/type.pm6
-rw-r--r--perl-install/fsedit.pm2
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index e4cf4503b..ab7689d30 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -323,9 +323,13 @@ sub isTrueLocalFS { member($_[0]{fs_type}, true_local_fs_types()) }
sub isOtherAvailableFS { isEfi($_[0]) || isFat_or_NTFS($_[0]) || member($_[0]{fs_type}, 'ufs', 'hfs', 'iso9660') } #- other OS that linux can access its filesystem
sub isMountableRW { (isTrueFS($_[0]) || isOtherAvailableFS($_[0])) && $_[0]{fs_type} ne 'ntfs' }
+sub cannotBeMountable {
+ my ($part) = @_;
+ isRawRAID($part) || isRawLVM($part);
+}
sub isNonMountable {
my ($part) = @_;
- isRawRAID($part) || isRawLVM($part) || $part->{fs_type} eq 'ntfs' && !$part->{isFormatted} && $part->{notFormatted};
+ cannotBeMountable($part) || $part->{fs_type} eq 'ntfs' && !$part->{isFormatted} && $part->{notFormatted};
}
sub isPartOfLVM { defined $_[0]{lvm} }
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 95e5937c1..cd0292c69 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -550,7 +550,7 @@ sub change_type {
delete $part->{device_UUID};
$hd->{isDirty} = 1;
$part->{mntpoint} = '' if isSwap($part) && $part->{mntpoint} eq "swap";
- $part->{mntpoint} = '' if isRawLVM($type) || isRawRAID($type);
+ $part->{mntpoint} = '' if fs::type::cannotBeMountable($part);
set_isFormatted($part, 0);
fs::type::set_type_subpart($part, $type);
fs::mount_options::rationalize($part);